Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/ClangImporter/ImportName.cpp

@@ -1426,8 +1426,14 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
     case clang::OverloadedOperatorKind::OO_Percent:
     case clang::OverloadedOperatorKind::OO_Amp:
     case clang::OverloadedOperatorKind::OO_Pipe:
+    case clang::OverloadedOperatorKind::OO_Less:
+    case clang::OverloadedOperatorKind::OO_Greater:
     case clang::OverloadedOperatorKind::OO_LessLess:
     case clang::OverloadedOperatorKind::OO_GreaterGreater:
+    case clang::OverloadedOperatorKind::OO_EqualEqual:
+    case clang::OverloadedOperatorKind::OO_ExclaimEqual:
+    case clang::OverloadedOperatorKind::OO_LessEqual:
+    case clang::OverloadedOperatorKind::OO_GreaterEqual:
     case clang::OverloadedOperatorKind::OO_AmpAmp:
     case clang::OverloadedOperatorKind::OO_PipePipe:
       if (auto FD = dyn_cast<clang::FunctionDecl>(D)) {

test/Interop/Cxx/operators/Inputs/non-member-inline.h

@@ -41,6 +41,26 @@ inline IntBox operator>>(IntBox lhs, IntBox rhs) {
   return IntBox{.value = lhs.value >> rhs.value};
 }
 
+inline bool operator<(IntBox lhs, IntBox rhs) { return lhs.value < rhs.value; }
+
+inline bool operator>(IntBox lhs, IntBox rhs) { return lhs.value > rhs.value; }
+
+inline bool operator==(IntBox lhs, IntBox rhs) {
+  return lhs.value == rhs.value;
+}
+
+inline bool operator!=(IntBox lhs, IntBox rhs) {
+  return lhs.value != rhs.value;
+}
+
+inline bool operator<=(IntBox lhs, IntBox rhs) {
+  return lhs.value == rhs.value;
+}
+
+inline bool operator>=(IntBox lhs, IntBox rhs) {
+  return lhs.value != rhs.value;
+}
+
 struct BoolBox {
   bool value;
 };

test/Interop/Cxx/operators/non-member-inline-module-interface.swift

@@ -9,6 +9,12 @@
 // CHECK-NEXT: func | (lhs: IntBox, rhs: IntBox) -> IntBox
 // CHECK-NEXT: func << (lhs: IntBox, rhs: IntBox) -> IntBox
 // CHECK-NEXT: func >> (lhs: IntBox, rhs: IntBox) -> IntBox
+// CHECK-NEXT: func < (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func > (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func == (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func != (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func <= (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func >= (lhs: IntBox, rhs: IntBox) -> Bool
 
 // CHECK:      func && (lhs: BoolBox, rhs: BoolBox) -> BoolBox
 // CHECK-NEXT: func || (lhs: BoolBox, rhs: BoolBox) -> BoolBox

test/Interop/Cxx/operators/non-member-inline-typechecker.swift

@@ -14,6 +14,12 @@ let resultAmp = lhs & rhs
 let resultPipe = lhs | rhs
 let resultLessLess = lhs << rhs
 let resultGreaterGreater = lhs >> rhs
+let resultLess = lhs < rhs
+let resultGreater = lhs > rhs
+let resultEqualEqual = lhs == rhs
+let resultExclaimEqual = lhs != rhs
+let resultLessEqual = lhs <= rhs
+let resultGreaterEqual = lhs >= rhs
 
 var lhsBool = BoolBox(value: true)
 var rhsBool = BoolBox(value: false)

test/Interop/Cxx/operators/non-member-inline.swift

@@ -43,7 +43,7 @@ OperatorsTestSuite.test("slash (/)") {
   expectEqual(1, result.value)
 }
 
-OperatorsTestSuite.test("percent") {
+OperatorsTestSuite.test("percent (%)") {
   let lhs = IntBox(value: 11)
   let rhs = IntBox(value: 2)
 
@@ -52,7 +52,7 @@ OperatorsTestSuite.test("percent") {
   expectEqual(1, result.value)
 }
 
-OperatorsTestSuite.test("amp") {
+OperatorsTestSuite.test("amp (&)") {
   let lhs = IntBox(value: 6)
   let rhs = IntBox(value: 5)
 
@@ -61,7 +61,7 @@ OperatorsTestSuite.test("amp") {
   expectEqual(4, result.value)
 }
 
-OperatorsTestSuite.test("pipe") {
+OperatorsTestSuite.test("pipe (|)") {
   let lhs = IntBox(value: 6)
   let rhs = IntBox(value: 5)
 
@@ -70,6 +70,24 @@ OperatorsTestSuite.test("pipe") {
   expectEqual(7, result.value)
 }
 
+OperatorsTestSuite.test("less (<)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 6)
+
+  let result = lhs < rhs
+
+  expectEqual(true, result)
+}
+
+OperatorsTestSuite.test("greater (>)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 6)
+
+  let result = lhs > rhs
+
+  expectEqual(false, result)
+}
+
 OperatorsTestSuite.test("less less (<<)") {
   let lhs = IntBox(value: 2)
   let rhs = IntBox(value: 4)
@@ -88,6 +106,42 @@ OperatorsTestSuite.test("greater greater (>>)") {
   expectEqual(2, result.value)
 }
 
+OperatorsTestSuite.test("equal equal (==)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs == rhs
+
+  expectEqual(true, result)
+}
+
+OperatorsTestSuite.test("exclaim equal (!=)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs != rhs
+
+  expectEqual(false, result)
+}
+
+OperatorsTestSuite.test("less equal (<=)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs <= rhs
+
+  expectEqual(true, result)
+}
+
+OperatorsTestSuite.test("greater equal (>=)") {
+  let lhs = IntBox(value: 6)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs >= rhs
+
+  expectEqual(true, result)
+}
+
 OperatorsTestSuite.test("amp amp (&&)") {
   let lhs = BoolBox(value: true)
   let rhs = BoolBox(value: false)