---

yaml
---
r: 445647
b: refs/heads/master-rebranch
c: 3a23e08
h: refs/heads/master
i:
  445645: 351cfd1
  445643: 6ae383d
  445639: 1d0e0d2
  445631: e77ae62

Author: zoecarver

[refs]

@@ -1701,7 +1701,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-19-a: 550bd4128211e1135c31ab186d2a9
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a: f3e865a19683d7e9664718c41e4e956686efb1b3
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-21-a: 0852188b163c7ebd7054379e729cedc41c361f95
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-22-a: 4832e0c5e8723b7b4a2c626ac6a8a523576f1317
-refs/heads/master-rebranch: d411f92cdd00918ab49393d13ef72e406206ae58
+refs/heads/master-rebranch: 3a23e086d2c5dfc03a087b0361a208b78d373ed3
 refs/heads/revert-29064-handle-csdiag-coerce-diagnostics: 69656f1629e2cde21bb7f44179c535c1f3ad5dfd
 refs/heads/swift-5.1-DEVELOPMENT-SNAPSHOT-2018-11-16-a: 51fe19105062bb86b997c7698bb3f83ffc536d2c
 refs/heads/tgmath-derivatives-wip: 00adac82d118281f701c26fe8702ecb4bbe33e82

branches/master-rebranch/lib/ClangImporter/ImportName.cpp

@@ -1426,16 +1426,16 @@ 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_LessLess:
-    case clang::OverloadedOperatorKind::OO_GreaterGreater:
-    case clang::OverloadedOperatorKind::OO_AmpAmp:
-    case clang::OverloadedOperatorKind::OO_PipePipe:
     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)) {
         baseName = clang::getOperatorSpelling(op);
         isFunction = true;

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

@@ -41,13 +41,9 @@ 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;

branches/master-rebranch/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,42 +70,6 @@ OperatorsTestSuite.test("pipe") {
   expectEqual(7, result.value)
 }
 
-OperatorsTestSuite.test("less less (<<)") {
-  let lhs = IntBox(value: 2)
-  let rhs = IntBox(value: 4)
-
-  let result = lhs << rhs
-
-  expectEqual(32, result.value)
-}
-
-OperatorsTestSuite.test("greater greater (>>)") {
-  let lhs = IntBox(value: 512)
-  let rhs = IntBox(value: 8)
-
-  let result = lhs >> rhs
-
-  expectEqual(2, result.value)
-}
-
-OperatorsTestSuite.test("amp amp (&&)") {
-  let lhs = BoolBox(value: true)
-  let rhs = BoolBox(value: false)
-
-  let result = lhs && rhs
-
-  expectEqual(false, result.value)
-}
-
-OperatorsTestSuite.test("pipe pipe (||)") {
-  let lhs = BoolBox(value: true)
-  let rhs = BoolBox(value: false)
-
-  let result = lhs || rhs
-
-  expectEqual(true, result.value)
-}
-
 OperatorsTestSuite.test("less (<)") {
   let lhs = IntBox(value: 5)
   let rhs = IntBox(value: 6)
@@ -124,6 +88,24 @@ OperatorsTestSuite.test("greater (>)") {
   expectEqual(false, result)
 }
 
+OperatorsTestSuite.test("less less (<<)") {
+  let lhs = IntBox(value: 2)
+  let rhs = IntBox(value: 4)
+
+  let result = lhs << rhs
+
+  expectEqual(32, result.value)
+}
+
+OperatorsTestSuite.test("greater greater (>>)") {
+  let lhs = IntBox(value: 512)
+  let rhs = IntBox(value: 8)
+
+  let result = lhs >> rhs
+
+  expectEqual(2, result.value)
+}
+
 OperatorsTestSuite.test("equal equal (==)") {
   let lhs = IntBox(value: 5)
   let rhs = IntBox(value: 5)
@@ -160,4 +142,22 @@ OperatorsTestSuite.test("greater equal (>=)") {
   expectEqual(true, result)
 }
 
+OperatorsTestSuite.test("amp amp (&&)") {
+  let lhs = BoolBox(value: true)
+  let rhs = BoolBox(value: false)
+
+  let result = lhs && rhs
+
+  expectEqual(false, result.value)
+}
+
+OperatorsTestSuite.test("pipe pipe (||)") {
+  let lhs = BoolBox(value: true)
+  let rhs = BoolBox(value: false)
+
+  let result = lhs || rhs
+
+  expectEqual(true, result.value)
+}
+
 runAllTests()