address review comments

Author: kkwli

flang/include/flang/Common/uint128.h

@@ -23,16 +23,6 @@
 #include <cstdint>
 #include <type_traits>
 
-#if FLANG_LITTLE_ENDIAN
-#define SWAP(a, i, b, j) \
-  a{i}, b { j }
-#elif FLANG_BIG_ENDIAN
-#define SWAP(a, i, b, j) \
-  b{j}, a { i }
-#else
-#error host endianness is not known
-#endif
-
 namespace Fortran::common {
 
 template <bool IS_SIGNED = false> class Int128 {
@@ -43,15 +33,18 @@ template <bool IS_SIGNED = false> class Int128 {
   constexpr Int128(unsigned n) : low_{n} {}
   constexpr Int128(unsigned long n) : low_{n} {}
   constexpr Int128(unsigned long long n) : low_{n} {}
-  constexpr Int128(int n)
-      : SWAP(low_, static_cast<std::uint64_t>(n), high_,
-            -static_cast<std::uint64_t>(n < 0)) {}
-  constexpr Int128(long n)
-      : SWAP(low_, static_cast<std::uint64_t>(n), high_,
-            -static_cast<std::uint64_t>(n < 0)) {}
-  constexpr Int128(long long n)
-      : SWAP(low_, static_cast<std::uint64_t>(n), high_,
-            -static_cast<std::uint64_t>(n < 0)) {}
+  constexpr Int128(int n) {
+    low_ = static_cast<std::uint64_t>(n);
+    high_ = -static_cast<std::uint64_t>(n < 0);
+  }
+  constexpr Int128(long n) {
+    low_ = static_cast<std::uint64_t>(n);
+    high_ = -static_cast<std::uint64_t>(n < 0);
+  }
+  constexpr Int128(long long n) {
+    low_ = static_cast<std::uint64_t>(n);
+    high_ = -static_cast<std::uint64_t>(n < 0);
+  }
   constexpr Int128(const Int128 &) = default;
   constexpr Int128(Int128 &&) = default;
   constexpr Int128 &operator=(const Int128 &) = default;
@@ -256,8 +249,10 @@ template <bool IS_SIGNED = false> class Int128 {
   }
 
 private:
-  constexpr Int128(std::uint64_t hi, std::uint64_t lo)
-      : SWAP(low_, lo, high_, hi) {}
+  constexpr Int128(std::uint64_t hi, std::uint64_t lo) {
+    low_ = lo;
+    high_ = hi;
+  }
   constexpr int LeadingZeroes() const {
     if (high_ == 0) {
       return 64 + LeadingZeroBitCount(low_);
@@ -266,7 +261,13 @@ template <bool IS_SIGNED = false> class Int128 {
     }
   }
   static constexpr std::uint64_t topBit{std::uint64_t{1} << 63};
-  std::uint64_t SWAP(low_, 0, high_, 0);
+#if FLANG_LITTLE_ENDIAN
+  std::uint64_t low_{0}, high_{0};
+#elif FLANG_BIG_ENDIAN
+  std::uint64_t high_{0}, low_{0};
+#else
+#error host endianness is not known
+#endif
 };
 
 using UnsignedInt128 = Int128<false>;
@@ -299,7 +300,4 @@ template <int BITS>
 using HostSignedIntType = typename HostSignedIntTypeHelper<BITS>::type;
 
 } // namespace Fortran::common
-
-#undef SWAP
-
 #endif