Move to C++ concepts, 3/n

Summary: Convert constraints to C++ concepts.

Reviewed By: alexmalyshev

Differential Revision: D78572883

fbshipit-source-id: 95ecaf41013abf230b4ff5bc317177688d3a7090

Author: yoney

Jit/bytecode_offsets.h

@@ -10,6 +10,7 @@
 
 #include "cinderx/Common/log.h"
 
+#include <concepts>
 #include <limits>
 #include <ostream>
 #include <type_traits>
@@ -124,7 +125,7 @@ class BCOffset : public BCOffsetBase<BCOffset> {
     return value() <=> other.value();
   }
 
-  template <class TInt, class = std::enable_if_t<std::is_integral_v<TInt>>>
+  template <std::integral TInt>
   constexpr std::strong_ordering operator<=>(const TInt& other) const {
     return value() <=> other;
   }
@@ -133,7 +134,7 @@ class BCOffset : public BCOffsetBase<BCOffset> {
     return value() == other.value();
   }
 
-  template <class TInt, class = std::enable_if_t<std::is_integral_v<TInt>>>
+  template <std::integral TInt>
   constexpr bool operator==(const TInt& other) const {
     return value() == other;
   }
@@ -153,7 +154,7 @@ class BCIndex : public BCOffsetBase<BCIndex> {
     return value() <=> other.value();
   }
 
-  template <class TInt, class = std::enable_if_t<std::is_integral_v<TInt>>>
+  template <std::integral TInt>
   constexpr std::strong_ordering operator<=>(const TInt& other) const {
     return value() <=> other;
   }
@@ -162,7 +163,7 @@ class BCIndex : public BCOffsetBase<BCIndex> {
     return value() == other.value();
   }
 
-  template <class TInt, class = std::enable_if_t<std::is_integral_v<TInt>>>
+  template <std::integral TInt>
   constexpr bool operator==(const TInt& other) const {
     return value() == other;
   }

Jit/hir/hir.h

@@ -631,7 +631,8 @@ class InstrT<T, opcode, Operands<arity>, Tys...>
   // Usage:
   //   auto instr = T::create(<args for T's constructor>);
   template <typename... Args, class T1 = T>
-  static std::enable_if_t<arity >= 0, T1>* create(Args&&... args) {
+    requires(arity >= 0)
+  static T1* create(Args&&... args) {
     auto ptr = Instr::allocate(sizeof(T1), arity);
     return new (ptr) T1(std::forward<Args>(args)...);
   }
@@ -641,53 +642,45 @@ class InstrT<T, opcode, Operands<arity>, Tys...>
   // Usage:
   //   auto instr = T::create(<num_operands>, <args for T's constructor>);
   template <typename... Args, class T1 = T>
-  static std::enable_if_t<arity == kVariadic, T1>* create(
-      std::size_t num_ops,
-      Args&&... args) {
+    requires(arity == kVariadic)
+  static T1* create(std::size_t num_ops, Args&&... args) {
     auto ptr = Instr::allocate(sizeof(T1), num_ops);
     return new (ptr) T1(std::forward<Args>(args)...);
   }
 
   // Forwarding constructor for variadic `T`.
-  template <
-      typename... Args,
-      int a = arity,
-      typename = std::enable_if_t<a <= 0>>
+  template <typename... Args, int a = arity>
+    requires(a <= 0)
   explicit InstrT(Args&&... args)
       : InstrT<T, opcode, Tys...>(std::forward<Args>(args)...) {}
 
   // Constructor for unary `T`.
-  template <
-      typename... Args,
-      int a = arity,
-      typename = std::enable_if_t<a == 1>>
+  template <typename... Args, int a = arity>
+    requires(a == 1)
   explicit InstrT(Register* reg, Args&&... args)
       : InstrT<T, opcode, Tys...>(std::forward<Args>(args)...) {
     this->operandAt(0) = reg;
   }
 
   // TODO(mpage) - Get rid of this?
-  template <int a = arity, typename T1 = std::enable_if_t<a == 1, Register>>
-  T1* reg() const {
+  template <int a = arity>
+    requires(a == 1)
+  Register* reg() const {
     return this->GetOperand(0);
   }
 
   // Constructor for binary `T`.
-  template <
-      typename... Args,
-      int a = arity,
-      typename = std::enable_if_t<a == 2>>
+  template <typename... Args, int a = arity>
+    requires(a == 2)
   InstrT(Register* lhs, Register* rhs, Args&&... args)
       : InstrT<T, opcode, Tys...>(std::forward<Args>(args)...) {
     this->operandAt(0) = lhs;
     this->operandAt(1) = rhs;
   }
 
   // Constructor for trinary `T`.
-  template <
-      typename... Args,
-      int x = arity,
-      typename = std::enable_if_t<x == 3>>
+  template <typename... Args, int x = arity>
+    requires(x == 3)
   InstrT(Register* a, Register* b, Register* c, Args&&... args)
       : InstrT<T, opcode, Tys...>(std::forward<Args>(args)...) {
     this->operandAt(0) = a;
@@ -696,10 +689,8 @@ class InstrT<T, opcode, Operands<arity>, Tys...>
   }
 
   // Constructor for 4 operand `T`.
-  template <
-      typename... Args,
-      int x = arity,
-      typename = std::enable_if_t<x == 4>>
+  template <typename... Args, int x = arity>
+    requires(x == 4)
   InstrT(Register* a, Register* b, Register* c, Register* d, Args&&... args)
       : InstrT<T, opcode, Tys...>(std::forward<Args>(args)...) {
     this->operandAt(0) = a;