Use std library

Summary: Replace macro with requires constraint.

Reviewed By: alexmalyshev

Differential Revision: D79450308

fbshipit-source-id: e03a0c0b31e66804c39aec687b6c942def1de857

Author: yoney

cinderx/Common/util.h

@@ -276,15 +276,6 @@ struct FreeDeleter {
 template <typename T>
 using unique_c_ptr = std::unique_ptr<T, FreeDeleter>;
 
-#include <concepts>
-
-#define REQUIRES_CALLABLE(...) requires jit::Callable<__VA_ARGS__>
-// Similar to std::invocable<F, Args...>, but also constrains the return type.
-template <typename F, typename Ret, typename... Args>
-concept Callable = requires(F f, Args&&... args) {
-  { f(std::forward<Args>(args)...) } -> std::convertible_to<Ret>;
-};
-
 template <class T>
 class ScopeExit {
  public:

cinderx/Jit/runtime.h

@@ -22,6 +22,7 @@
 #include "cinderx/module_state.h"
 
 #include <optional>
+#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
@@ -462,7 +463,7 @@ class Runtime : public IRuntime {
 #if PY_VERSION_HEX < 0x030C0000
   // In 3.12+ the equivalent of this is in generators_rt.cpp.
   template <typename F>
-  REQUIRES_CALLABLE(F, int, PyObject*)
+    requires std::is_invocable_r_v<int, F, PyObject*>
   int forEachOwnedRef(PyGenObject* gen, std::size_t deopt_idx, F func) {
     const DeoptMetadata& meta = getDeoptMetadata(deopt_idx);
     auto base = reinterpret_cast<char*>(genDataFooter(gen));