Fix LWG 2934 - optional<const T> doesn't compare with T

llvm-svn: 299105

12 files changed, 534 insertions, 400 deletions

diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
index b54a08f5575..29fb7a8431f 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
@@ -17,37 +17,48 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator == ( const X &lhs, const X &rhs )
-    { return lhs.i_ == rhs.i_ ; }
+constexpr bool operator==(const X& lhs, const X& rhs) {
+  return lhs.i_ == rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;       // disengaged
-    constexpr O o2{1};    // engaged
-    constexpr O o3{val};  // engaged
-
-    static_assert ( !(o1 == T(1)), "" );
-    static_assert (  (o2 == T(1)), "" );
-    static_assert ( !(o3 == T(1)), "" );
-    static_assert (  (o3 == T(2)), "" );
-    static_assert (  (o3 == val),  "" );
-
-    static_assert ( !(T(1) == o1), "" );
-    static_assert (  (T(1) == o2), "" );
-    static_assert ( !(T(1) == o3), "" );
-    static_assert (  (T(2) == o3), "" );
-    static_assert (  (val  == o3), "" );
-    }
+    constexpr O o1;      // disengaged
+    constexpr O o2{1};   // engaged
+    constexpr O o3{val}; // engaged
+
+    static_assert(!(o1 == T(1)), "");
+    static_assert((o2 == T(1)), "");
+    static_assert(!(o3 == T(1)), "");
+    static_assert((o3 == T(2)), "");
+    static_assert((o3 == val), "");
+
+    static_assert(!(T(1) == o1), "");
+    static_assert((T(1) == o2), "");
+    static_assert(!(T(1) == o3), "");
+    static_assert((T(2) == o3), "");
+    static_assert((val == o3), "");
+  }
+  {
+    using O = optional<int>;
+    constexpr O o1(42);
+    static_assert(o1 == 42l, "");
+    static_assert(!(101l == o1), "");
+  }
+  {
+    using O = optional<const int>;
+    constexpr O o1(42);
+    static_assert(o1 == 42, "");
+    static_assert(!(101 == o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
index 064114fb9db..ae34eb20517 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
@@ -17,39 +17,48 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator > ( const X &lhs, const X &rhs )
-    { return lhs.i_ > rhs.i_ ; }
+constexpr bool operator>(const X& lhs, const X& rhs) { return lhs.i_ > rhs.i_; }
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;       // disengaged
-    constexpr O o2{1};    // engaged
-    constexpr O o3{val};  // engaged
-
-    static_assert ( !(o1 > T(1)), "" );
-    static_assert ( !(o2 > T(1)), "" );  // equal
-    static_assert (  (o3 > T(1)), "" );
-    static_assert ( !(o2 >  val), "" );
-    static_assert ( !(o3 >  val), "" );  // equal
-    static_assert ( !(o3 > T(3)), "" );
-
-    static_assert (   (T(1) > o1), "" );
-    static_assert (  !(T(1) > o2), "" ); // equal
-    static_assert (  !(T(1) > o3), "" );
-    static_assert (   (val  > o2), "" );
-    static_assert (  !(val  > o3), "" ); // equal
-    static_assert (   (T(3) > o3), "" );
-    }
+    constexpr O o1;      // disengaged
+    constexpr O o2{1};   // engaged
+    constexpr O o3{val}; // engaged
+
+    static_assert(!(o1 > T(1)), "");
+    static_assert(!(o2 > T(1)), ""); // equal
+    static_assert((o3 > T(1)), "");
+    static_assert(!(o2 > val), "");
+    static_assert(!(o3 > val), ""); // equal
+    static_assert(!(o3 > T(3)), "");
+
+    static_assert((T(1) > o1), "");
+    static_assert(!(T(1) > o2), ""); // equal
+    static_assert(!(T(1) > o3), "");
+    static_assert((val > o2), "");
+    static_assert(!(val > o3), ""); // equal
+    static_assert((T(3) > o3), "");
+  }
+  {
+    using O = optional<int>;
+    constexpr O o1(42);
+    static_assert(o1 > 11l, "");
+    static_assert(!(42l > o1), "");
+  }
+  {
+    using O = optional<const int>;
+    constexpr O o1(42);
+    static_assert(o1 > 11, "");
+    static_assert(!(42 > o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
index 663686cdf34..dac94002661 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
@@ -17,39 +17,50 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator >= ( const X &lhs, const X &rhs )
-    { return lhs.i_ >= rhs.i_ ; }
+constexpr bool operator>=(const X& lhs, const X& rhs) {
+  return lhs.i_ >= rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;       // disengaged
-    constexpr O o2{1};    // engaged
-    constexpr O o3{val};  // engaged
-
-    static_assert ( !(o1 >= T(1)), "" );
-    static_assert (  (o2 >= T(1)), "" );  // equal
-    static_assert (  (o3 >= T(1)), "" );
-    static_assert ( !(o2 >=  val), "" );
-    static_assert (  (o3 >=  val), "" );  // equal
-    static_assert ( !(o3 >= T(3)), "" );
-
-    static_assert (   (T(1) >= o1), "" );
-    static_assert (   (T(1) >= o2), "" ); // equal
-    static_assert (  !(T(1) >= o3), "" );
-    static_assert (   (val  >= o2), "" );
-    static_assert (   (val  >= o3), "" ); // equal
-    static_assert (   (T(3) >= o3), "" );
-    }
+    constexpr O o1;      // disengaged
+    constexpr O o2{1};   // engaged
+    constexpr O o3{val}; // engaged
+
+    static_assert(!(o1 >= T(1)), "");
+    static_assert((o2 >= T(1)), ""); // equal
+    static_assert((o3 >= T(1)), "");
+    static_assert(!(o2 >= val), "");
+    static_assert((o3 >= val), ""); // equal
+    static_assert(!(o3 >= T(3)), "");
+
+    static_assert((T(1) >= o1), "");
+    static_assert((T(1) >= o2), ""); // equal
+    static_assert(!(T(1) >= o3), "");
+    static_assert((val >= o2), "");
+    static_assert((val >= o3), ""); // equal
+    static_assert((T(3) >= o3), "");
+  }
+  {
+    using O = optional<int>;
+    constexpr O o1(42);
+    static_assert(o1 >= 42l, "");
+    static_assert(!(11l >= o1), "");
+  }
+  {
+    using O = optional<const int>;
+    constexpr O o1(42);
+    static_assert(o1 >= 42, "");
+    static_assert(!(11 >= o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
index 05ac5eb12b4..b71f8363b0a 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
@@ -17,39 +17,50 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator <= ( const X &lhs, const X &rhs )
-    { return lhs.i_ <= rhs.i_ ; }
+constexpr bool operator<=(const X& lhs, const X& rhs) {
+  return lhs.i_ <= rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;       // disengaged
-    constexpr O o2{1};    // engaged
-    constexpr O o3{val};  // engaged
-
-    static_assert (  (o1 <= T(1)), "" );
-    static_assert (  (o2 <= T(1)), "" );  // equal
-    static_assert ( !(o3 <= T(1)), "" );
-    static_assert (  (o2 <=  val), "" );
-    static_assert (  (o3 <=  val), "" );  // equal
-    static_assert (  (o3 <= T(3)), "" );
-
-    static_assert (  !(T(1) <= o1), "" );
-    static_assert (   (T(1) <= o2), "" ); // equal
-    static_assert (   (T(1) <= o3), "" );
-    static_assert (  !(val  <= o2), "" );
-    static_assert (   (val  <= o3), "" ); // equal
-    static_assert (  !(T(3) <= o3), "" );
-    }
+    constexpr O o1;      // disengaged
+    constexpr O o2{1};   // engaged
+    constexpr O o3{val}; // engaged
+
+    static_assert((o1 <= T(1)), "");
+    static_assert((o2 <= T(1)), ""); // equal
+    static_assert(!(o3 <= T(1)), "");
+    static_assert((o2 <= val), "");
+    static_assert((o3 <= val), ""); // equal
+    static_assert((o3 <= T(3)), "");
+
+    static_assert(!(T(1) <= o1), "");
+    static_assert((T(1) <= o2), ""); // equal
+    static_assert((T(1) <= o3), "");
+    static_assert(!(val <= o2), "");
+    static_assert((val <= o3), ""); // equal
+    static_assert(!(T(3) <= o3), "");
+  }
+  {
+    using O = optional<int>;
+    constexpr O o1(42);
+    static_assert(o1 <= 42l, "");
+    static_assert(!(101l <= o1), "");
+  }
+  {
+    using O = optional<const int>;
+    constexpr O o1(42);
+    static_assert(o1 <= 42, "");
+    static_assert(!(101 <= o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
index d1891a286d7..84456b3baa6 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
@@ -17,39 +17,48 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator < ( const X &lhs, const X &rhs )
-    { return lhs.i_ < rhs.i_ ; }
+constexpr bool operator<(const X& lhs, const X& rhs) { return lhs.i_ < rhs.i_; }
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;       // disengaged
-    constexpr O o2{1};    // engaged
-    constexpr O o3{val};  // engaged
-
-    static_assert (  (o1 < T(1)), "" );
-    static_assert ( !(o2 < T(1)), "" );  // equal
-    static_assert ( !(o3 < T(1)), "" );
-    static_assert (  (o2 <  val), "" );
-    static_assert ( !(o3 <  val), "" );  // equal
-    static_assert (  (o3 < T(3)), "" );
-
-    static_assert (  !(T(1) < o1), "" );
-    static_assert (  !(T(1) < o2), "" ); // equal
-    static_assert (   (T(1) < o3), "" );
-    static_assert (  !(val  < o2), "" );
-    static_assert (  !(val  < o3), "" ); // equal
-    static_assert (  !(T(3) < o3), "" );
-    }
+    constexpr O o1;      // disengaged
+    constexpr O o2{1};   // engaged
+    constexpr O o3{val}; // engaged
+
+    static_assert((o1 < T(1)), "");
+    static_assert(!(o2 < T(1)), ""); // equal
+    static_assert(!(o3 < T(1)), "");
+    static_assert((o2 < val), "");
+    static_assert(!(o3 < val), ""); // equal
+    static_assert((o3 < T(3)), "");
+
+    static_assert(!(T(1) < o1), "");
+    static_assert(!(T(1) < o2), ""); // equal
+    static_assert((T(1) < o3), "");
+    static_assert(!(val < o2), "");
+    static_assert(!(val < o3), ""); // equal
+    static_assert(!(T(3) < o3), "");
+  }
+  {
+    using O = optional<int>;
+    constexpr O o1(42);
+    static_assert(o1 < 101l, "");
+    static_assert(!(42l < o1), "");
+  }
+  {
+    using O = optional<const int>;
+    constexpr O o1(42);
+    static_assert(o1 < 101, "");
+    static_assert(!(42 < o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
index ae2ff808fb2..a4ffdc25e72 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
@@ -17,37 +17,48 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator != ( const X &lhs, const X &rhs )
-    { return lhs.i_ != rhs.i_ ; }
+constexpr bool operator!=(const X& lhs, const X& rhs) {
+  return lhs.i_ != rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;       // disengaged
-    constexpr O o2{1};    // engaged
-    constexpr O o3{val};  // engaged
-
-    static_assert (  (o1 != T(1)), "" );
-    static_assert ( !(o2 != T(1)), "" );
-    static_assert (  (o3 != T(1)), "" );
-    static_assert ( !(o3 != T(2)), "" );
-    static_assert ( !(o3 != val),  "" );
-
-    static_assert (  (T(1) != o1), "" );
-    static_assert ( !(T(1) != o2), "" );
-    static_assert (  (T(1) != o3), "" );
-    static_assert ( !(T(2) != o3), "" );
-    static_assert ( !(val  != o3), "" );
-    }
+    constexpr O o1;      // disengaged
+    constexpr O o2{1};   // engaged
+    constexpr O o3{val}; // engaged
+
+    static_assert((o1 != T(1)), "");
+    static_assert(!(o2 != T(1)), "");
+    static_assert((o3 != T(1)), "");
+    static_assert(!(o3 != T(2)), "");
+    static_assert(!(o3 != val), "");
+
+    static_assert((T(1) != o1), "");
+    static_assert(!(T(1) != o2), "");
+    static_assert((T(1) != o3), "");
+    static_assert(!(T(2) != o3), "");
+    static_assert(!(val != o3), "");
+  }
+  {
+    using O = optional<int>;
+    constexpr O o1(42);
+    static_assert(o1 != 101l, "");
+    static_assert(!(42l != o1), "");
+  }
+  {
+    using O = optional<const int>;
+    constexpr O o1(42);
+    static_assert(o1 != 101, "");
+    static_assert(!(42 != o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp
index 6650b6720a8..7667540f976 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp
@@ -18,57 +18,69 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator == ( const X &lhs, const X &rhs )
-    { return lhs.i_ == rhs.i_ ; }
+constexpr bool operator==(const X& lhs, const X& rhs) {
+  return lhs.i_ == rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2;     // disengaged
-    constexpr O o3{1};  // engaged
-    constexpr O o4{2};  // engaged
-    constexpr O o5{1};  // engaged
-
-    static_assert (   o1 == o1 , "" );
-    static_assert (   o1 == o2 , "" );
-    static_assert ( !(o1 == o3), "" );
-    static_assert ( !(o1 == o4), "" );
-    static_assert ( !(o1 == o5), "" );
+    constexpr O o1;    // disengaged
+    constexpr O o2;    // disengaged
+    constexpr O o3{1}; // engaged
+    constexpr O o4{2}; // engaged
+    constexpr O o5{1}; // engaged
 
-    static_assert (   o2 == o1 , "" );
-    static_assert (   o2 == o2 , "" );
-    static_assert ( !(o2 == o3), "" );
-    static_assert ( !(o2 == o4), "" );
-    static_assert ( !(o2 == o5), "" );
+    static_assert(o1 == o1, "");
+    static_assert(o1 == o2, "");
+    static_assert(!(o1 == o3), "");
+    static_assert(!(o1 == o4), "");
+    static_assert(!(o1 == o5), "");
 
-    static_assert ( !(o3 == o1), "" );
-    static_assert ( !(o3 == o2), "" );
-    static_assert (   o3 == o3 , "" );
-    static_assert ( !(o3 == o4), "" );
-    static_assert (   o3 == o5 , "" );
+    static_assert(o2 == o1, "");
+    static_assert(o2 == o2, "");
+    static_assert(!(o2 == o3), "");
+    static_assert(!(o2 == o4), "");
+    static_assert(!(o2 == o5), "");
 
-    static_assert ( !(o4 == o1), "" );
-    static_assert ( !(o4 == o2), "" );
-    static_assert ( !(o4 == o3), "" );
-    static_assert (   o4 == o4 , "" );
-    static_assert ( !(o4 == o5), "" );
+    static_assert(!(o3 == o1), "");
+    static_assert(!(o3 == o2), "");
+    static_assert(o3 == o3, "");
+    static_assert(!(o3 == o4), "");
+    static_assert(o3 == o5, "");
 
-    static_assert ( !(o5 == o1), "" );
-    static_assert ( !(o5 == o2), "" );
-    static_assert (   o5 == o3 , "" );
-    static_assert ( !(o5 == o4), "" );
-    static_assert (   o5 == o5 , "" );
+    static_assert(!(o4 == o1), "");
+    static_assert(!(o4 == o2), "");
+    static_assert(!(o4 == o3), "");
+    static_assert(o4 == o4, "");
+    static_assert(!(o4 == o5), "");
 
-    }
+    static_assert(!(o5 == o1), "");
+    static_assert(!(o5 == o2), "");
+    static_assert(o5 == o3, "");
+    static_assert(!(o5 == o4), "");
+    static_assert(o5 == o5, "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<long>;
+    constexpr O1 o1(42);
+    static_assert(o1 == O2(42), "");
+    static_assert(!(O2(101) == o1), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<const int>;
+    constexpr O1 o1(42);
+    static_assert(o1 == O2(42), "");
+    static_assert(!(O2(101) == o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
index f9b30449638..0e05834c147 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
@@ -16,55 +16,68 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator >= ( const X &lhs, const X &rhs )
-    { return lhs.i_ >= rhs.i_ ; }
+constexpr bool operator>=(const X& lhs, const X& rhs) {
+  return lhs.i_ >= rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef optional<X> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2;     // disengaged
-    constexpr O o3{1};  // engaged
-    constexpr O o4{2};  // engaged
-    constexpr O o5{1};  // engaged
+    constexpr O o1;    // disengaged
+    constexpr O o2;    // disengaged
+    constexpr O o3{1}; // engaged
+    constexpr O o4{2}; // engaged
+    constexpr O o5{1}; // engaged
 
-    static_assert (  (o1 >= o1), "" );
-    static_assert (  (o1 >= o2), "" );
-    static_assert ( !(o1 >= o3), "" );
-    static_assert ( !(o1 >= o4), "" );
-    static_assert ( !(o1 >= o5), "" );
+    static_assert((o1 >= o1), "");
+    static_assert((o1 >= o2), "");
+    static_assert(!(o1 >= o3), "");
+    static_assert(!(o1 >= o4), "");
+    static_assert(!(o1 >= o5), "");
 
-    static_assert (  (o2 >= o1), "" );
-    static_assert (  (o2 >= o2), "" );
-    static_assert ( !(o2 >= o3), "" );
-    static_assert ( !(o2 >= o4), "" );
-    static_assert ( !(o2 >= o5), "" );
+    static_assert((o2 >= o1), "");
+    static_assert((o2 >= o2), "");
+    static_assert(!(o2 >= o3), "");
+    static_assert(!(o2 >= o4), "");
+    static_assert(!(o2 >= o5), "");
 
-    static_assert (  (o3 >= o1), "" );
-    static_assert (  (o3 >= o2), "" );
-    static_assert (  (o3 >= o3), "" );
-    static_assert ( !(o3 >= o4), "" );
-    static_assert (  (o3 >= o5), "" );
+    static_assert((o3 >= o1), "");
+    static_assert((o3 >= o2), "");
+    static_assert((o3 >= o3), "");
+    static_assert(!(o3 >= o4), "");
+    static_assert((o3 >= o5), "");
 
-    static_assert (  (o4 >= o1), "" );
-    static_assert (  (o4 >= o2), "" );
-    static_assert (  (o4 >= o3), "" );
-    static_assert (  (o4 >= o4), "" );
-    static_assert (  (o4 >= o5), "" );
+    static_assert((o4 >= o1), "");
+    static_assert((o4 >= o2), "");
+    static_assert((o4 >= o3), "");
+    static_assert((o4 >= o4), "");
+    static_assert((o4 >= o5), "");
 
-    static_assert (  (o5 >= o1), "" );
-    static_assert (  (o5 >= o2), "" );
-    static_assert (  (o5 >= o3), "" );
-    static_assert ( !(o5 >= o4), "" );
-    static_assert (  (o5 >= o5), "" );
-    }
+    static_assert((o5 >= o1), "");
+    static_assert((o5 >= o2), "");
+    static_assert((o5 >= o3), "");
+    static_assert(!(o5 >= o4), "");
+    static_assert((o5 >= o5), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<long>;
+    constexpr O1 o1(42);
+    static_assert(o1 >= O2(42), "");
+    static_assert(!(O2(11) >= o1), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<const int>;
+    constexpr O1 o1(42);
+    static_assert(o1 >= O2(42), "");
+    static_assert(!(O2(1) >= o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
index 8a27eb471f2..3946a6102ba 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
@@ -16,55 +16,66 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator > ( const X &lhs, const X &rhs )
-    { return lhs.i_ > rhs.i_ ; }
+constexpr bool operator>(const X& lhs, const X& rhs) { return lhs.i_ > rhs.i_; }
 
-int main()
-{
-    {
+int main() {
+  {
     typedef optional<X> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2;     // disengaged
-    constexpr O o3{1};  // engaged
-    constexpr O o4{2};  // engaged
-    constexpr O o5{1};  // engaged
+    constexpr O o1;    // disengaged
+    constexpr O o2;    // disengaged
+    constexpr O o3{1}; // engaged
+    constexpr O o4{2}; // engaged
+    constexpr O o5{1}; // engaged
 
-    static_assert ( !(o1 > o1), "" );
-    static_assert ( !(o1 > o2), "" );
-    static_assert ( !(o1 > o3), "" );
-    static_assert ( !(o1 > o4), "" );
-    static_assert ( !(o1 > o5), "" );
+    static_assert(!(o1 > o1), "");
+    static_assert(!(o1 > o2), "");
+    static_assert(!(o1 > o3), "");
+    static_assert(!(o1 > o4), "");
+    static_assert(!(o1 > o5), "");
 
-    static_assert ( !(o2 > o1), "" );
-    static_assert ( !(o2 > o2), "" );
-    static_assert ( !(o2 > o3), "" );
-    static_assert ( !(o2 > o4), "" );
-    static_assert ( !(o2 > o5), "" );
+    static_assert(!(o2 > o1), "");
+    static_assert(!(o2 > o2), "");
+    static_assert(!(o2 > o3), "");
+    static_assert(!(o2 > o4), "");
+    static_assert(!(o2 > o5), "");
 
-    static_assert (  (o3 > o1), "" );
-    static_assert (  (o3 > o2), "" );
-    static_assert ( !(o3 > o3), "" );
-    static_assert ( !(o3 > o4), "" );
-    static_assert ( !(o3 > o5), "" );
+    static_assert((o3 > o1), "");
+    static_assert((o3 > o2), "");
+    static_assert(!(o3 > o3), "");
+    static_assert(!(o3 > o4), "");
+    static_assert(!(o3 > o5), "");
 
-    static_assert (  (o4 > o1), "" );
-    static_assert (  (o4 > o2), "" );
-    static_assert (  (o4 > o3), "" );
-    static_assert ( !(o4 > o4), "" );
-    static_assert (  (o4 > o5), "" );
+    static_assert((o4 > o1), "");
+    static_assert((o4 > o2), "");
+    static_assert((o4 > o3), "");
+    static_assert(!(o4 > o4), "");
+    static_assert((o4 > o5), "");
 
-    static_assert (  (o5 > o1), "" );
-    static_assert (  (o5 > o2), "" );
-    static_assert ( !(o5 > o3), "" );
-    static_assert ( !(o5 > o4), "" );
-    static_assert ( !(o5 > o5), "" );
-    }
+    static_assert((o5 > o1), "");
+    static_assert((o5 > o2), "");
+    static_assert(!(o5 > o3), "");
+    static_assert(!(o5 > o4), "");
+    static_assert(!(o5 > o5), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<long>;
+    constexpr O1 o1(42);
+    static_assert(o1 > O2(1), "");
+    static_assert(!(O2(42) > o1), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<const int>;
+    constexpr O1 o1(42);
+    static_assert(o1 > O2(1), "");
+    static_assert(!(O2(42) > o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
index a7d594dd34a..5a1954154f4 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
@@ -16,55 +16,68 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator <= ( const X &lhs, const X &rhs )
-    { return lhs.i_ <= rhs.i_ ; }
+constexpr bool operator<=(const X& lhs, const X& rhs) {
+  return lhs.i_ <= rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef optional<X> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2;     // disengaged
-    constexpr O o3{1};  // engaged
-    constexpr O o4{2};  // engaged
-    constexpr O o5{1};  // engaged
+    constexpr O o1;    // disengaged
+    constexpr O o2;    // disengaged
+    constexpr O o3{1}; // engaged
+    constexpr O o4{2}; // engaged
+    constexpr O o5{1}; // engaged
 
-    static_assert (  (o1 <= o1), "" );
-    static_assert (  (o1 <= o2), "" );
-    static_assert (  (o1 <= o3), "" );
-    static_assert (  (o1 <= o4), "" );
-    static_assert (  (o1 <= o5), "" );
+    static_assert((o1 <= o1), "");
+    static_assert((o1 <= o2), "");
+    static_assert((o1 <= o3), "");
+    static_assert((o1 <= o4), "");
+    static_assert((o1 <= o5), "");
 
-    static_assert (  (o2 <= o1), "" );
-    static_assert (  (o2 <= o2), "" );
-    static_assert (  (o2 <= o3), "" );
-    static_assert (  (o2 <= o4), "" );
-    static_assert (  (o2 <= o5), "" );
+    static_assert((o2 <= o1), "");
+    static_assert((o2 <= o2), "");
+    static_assert((o2 <= o3), "");
+    static_assert((o2 <= o4), "");
+    static_assert((o2 <= o5), "");
 
-    static_assert ( !(o3 <= o1), "" );
-    static_assert ( !(o3 <= o2), "" );
-    static_assert (  (o3 <= o3), "" );
-    static_assert (  (o3 <= o4), "" );
-    static_assert (  (o3 <= o5), "" );
+    static_assert(!(o3 <= o1), "");
+    static_assert(!(o3 <= o2), "");
+    static_assert((o3 <= o3), "");
+    static_assert((o3 <= o4), "");
+    static_assert((o3 <= o5), "");
 
-    static_assert ( !(o4 <= o1), "" );
-    static_assert ( !(o4 <= o2), "" );
-    static_assert ( !(o4 <= o3), "" );
-    static_assert (  (o4 <= o4), "" );
-    static_assert ( !(o4 <= o5), "" );
+    static_assert(!(o4 <= o1), "");
+    static_assert(!(o4 <= o2), "");
+    static_assert(!(o4 <= o3), "");
+    static_assert((o4 <= o4), "");
+    static_assert(!(o4 <= o5), "");
 
-    static_assert ( !(o5 <= o1), "" );
-    static_assert ( !(o5 <= o2), "" );
-    static_assert (  (o5 <= o3), "" );
-    static_assert (  (o5 <= o4), "" );
-    static_assert (  (o5 <= o5), "" );
-    }
+    static_assert(!(o5 <= o1), "");
+    static_assert(!(o5 <= o2), "");
+    static_assert((o5 <= o3), "");
+    static_assert((o5 <= o4), "");
+    static_assert((o5 <= o5), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<long>;
+    constexpr O1 o1(42);
+    static_assert(o1 <= O2(42), "");
+    static_assert(!(O2(101) <= o1), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<const int>;
+    constexpr O1 o1(42);
+    static_assert(o1 <= O2(42), "");
+    static_assert(!(O2(101) <= o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp
index deffa5e849f..35956e6f4a7 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp
@@ -16,55 +16,66 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator < ( const X &lhs, const X &rhs )
-    { return lhs.i_ < rhs.i_ ; }
+constexpr bool operator<(const X& lhs, const X& rhs) { return lhs.i_ < rhs.i_; }
 
-int main()
-{
-    {
+int main() {
+  {
     typedef optional<X> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2;     // disengaged
-    constexpr O o3{1};  // engaged
-    constexpr O o4{2};  // engaged
-    constexpr O o5{1};  // engaged
+    constexpr O o1;    // disengaged
+    constexpr O o2;    // disengaged
+    constexpr O o3{1}; // engaged
+    constexpr O o4{2}; // engaged
+    constexpr O o5{1}; // engaged
 
-    static_assert ( !(o1 < o1), "" );
-    static_assert ( !(o1 < o2), "" );
-    static_assert (  (o1 < o3), "" );
-    static_assert (  (o1 < o4), "" );
-    static_assert (  (o1 < o5), "" );
+    static_assert(!(o1 < o1), "");
+    static_assert(!(o1 < o2), "");
+    static_assert((o1 < o3), "");
+    static_assert((o1 < o4), "");
+    static_assert((o1 < o5), "");
 
-    static_assert ( !(o2 < o1), "" );
-    static_assert ( !(o2 < o2), "" );
-    static_assert (  (o2 < o3), "" );
-    static_assert (  (o2 < o4), "" );
-    static_assert (  (o2 < o5), "" );
+    static_assert(!(o2 < o1), "");
+    static_assert(!(o2 < o2), "");
+    static_assert((o2 < o3), "");
+    static_assert((o2 < o4), "");
+    static_assert((o2 < o5), "");
 
-    static_assert ( !(o3 < o1), "" );
-    static_assert ( !(o3 < o2), "" );
-    static_assert ( !(o3 < o3), "" );
-    static_assert (  (o3 < o4), "" );
-    static_assert ( !(o3 < o5), "" );
+    static_assert(!(o3 < o1), "");
+    static_assert(!(o3 < o2), "");
+    static_assert(!(o3 < o3), "");
+    static_assert((o3 < o4), "");
+    static_assert(!(o3 < o5), "");
 
-    static_assert ( !(o4 < o1), "" );
-    static_assert ( !(o4 < o2), "" );
-    static_assert ( !(o4 < o3), "" );
-    static_assert ( !(o4 < o4), "" );
-    static_assert ( !(o4 < o5), "" );
+    static_assert(!(o4 < o1), "");
+    static_assert(!(o4 < o2), "");
+    static_assert(!(o4 < o3), "");
+    static_assert(!(o4 < o4), "");
+    static_assert(!(o4 < o5), "");
 
-    static_assert ( !(o5 < o1), "" );
-    static_assert ( !(o5 < o2), "" );
-    static_assert ( !(o5 < o3), "" );
-    static_assert (  (o5 < o4), "" );
-    static_assert ( !(o5 < o5), "" );
-    }
+    static_assert(!(o5 < o1), "");
+    static_assert(!(o5 < o2), "");
+    static_assert(!(o5 < o3), "");
+    static_assert((o5 < o4), "");
+    static_assert(!(o5 < o5), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<long>;
+    constexpr O1 o1(42);
+    static_assert(o1 < O2(101), "");
+    static_assert(!(O2(101) < o1), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<const int>;
+    constexpr O1 o1(42);
+    static_assert(o1 < O2(101), "");
+    static_assert(!(O2(101) < o1), "");
+  }
 }
diff --git a/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
index fd11b2a207c..1256537d6a8 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
@@ -18,57 +18,69 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator != ( const X &lhs, const X &rhs )
-    { return lhs.i_ != rhs.i_ ; }
+constexpr bool operator!=(const X& lhs, const X& rhs) {
+  return lhs.i_ != rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2;     // disengaged
-    constexpr O o3{1};  // engaged
-    constexpr O o4{2};  // engaged
-    constexpr O o5{1};  // engaged
-
-    static_assert ( !(o1 != o1), "" );
-    static_assert ( !(o1 != o2), "" );
-    static_assert (  (o1 != o3), "" );
-    static_assert (  (o1 != o4), "" );
-    static_assert (  (o1 != o5), "" );
+    constexpr O o1;    // disengaged
+    constexpr O o2;    // disengaged
+    constexpr O o3{1}; // engaged
+    constexpr O o4{2}; // engaged
+    constexpr O o5{1}; // engaged
 
-    static_assert ( !(o2 != o1), "" );
-    static_assert ( !(o2 != o2), "" );
-    static_assert (  (o2 != o3), "" );
-    static_assert (  (o2 != o4), "" );
-    static_assert (  (o2 != o5), "" );
+    static_assert(!(o1 != o1), "");
+    static_assert(!(o1 != o2), "");
+    static_assert((o1 != o3), "");
+    static_assert((o1 != o4), "");
+    static_assert((o1 != o5), "");
 
-    static_assert (  (o3 != o1), "" );
-    static_assert (  (o3 != o2), "" );
-    static_assert ( !(o3 != o3), "" );
-    static_assert (  (o3 != o4), "" );
-    static_assert ( !(o3 != o5), "" );
+    static_assert(!(o2 != o1), "");
+    static_assert(!(o2 != o2), "");
+    static_assert((o2 != o3), "");
+    static_assert((o2 != o4), "");
+    static_assert((o2 != o5), "");
 
-    static_assert (  (o4 != o1), "" );
-    static_assert (  (o4 != o2), "" );
-    static_assert (  (o4 != o3), "" );
-    static_assert ( !(o4 != o4), "" );
-    static_assert (  (o4 != o5), "" );
+    static_assert((o3 != o1), "");
+    static_assert((o3 != o2), "");
+    static_assert(!(o3 != o3), "");
+    static_assert((o3 != o4), "");
+    static_assert(!(o3 != o5), "");
 
-    static_assert (  (o5 != o1), "" );
-    static_assert (  (o5 != o2), "" );
-    static_assert ( !(o5 != o3), "" );
-    static_assert (  (o5 != o4), "" );
-    static_assert ( !(o5 != o5), "" );
+    static_assert((o4 != o1), "");
+    static_assert((o4 != o2), "");
+    static_assert((o4 != o3), "");
+    static_assert(!(o4 != o4), "");
+    static_assert((o4 != o5), "");
 
-    }
+    static_assert((o5 != o1), "");
+    static_assert((o5 != o2), "");
+    static_assert(!(o5 != o3), "");
+    static_assert((o5 != o4), "");
+    static_assert(!(o5 != o5), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<long>;
+    constexpr O1 o1(42);
+    static_assert(o1 != O2(101), "");
+    static_assert(!(O2(42) != o1), "");
+  }
+  {
+    using O1 = optional<int>;
+    using O2 = optional<const int>;
+    constexpr O1 o1(42);
+    static_assert(o1 != O2(101), "");
+    static_assert(!(O2(42) != o1), "");
+  }
 }