Merge pull request #70325 from apple/egorzhdan/friend-operator-lookup

[cxx-interop] Add friend operators to the lookup table properly

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -2240,10 +2240,6 @@ namespace {
         if (auto friendDecl = dyn_cast<clang::FriendDecl>(m)) {
           if (friendDecl->getFriendDecl()) {
             m = friendDecl->getFriendDecl();
-
-            auto lookupTable = Impl.findLookupTable(decl);
-            addEntryToLookupTable(*lookupTable, friendDecl->getFriendDecl(),
-                                  Impl.getNameImporter());
           }
         }
 
@@ -2986,7 +2982,11 @@ namespace {
       // This cannot be done when building the lookup table,
       // because templates are instantiated lazily.
       for (auto member : def->decls()) {
-        if (auto method = dyn_cast<clang::CXXMethodDecl>(member)) {
+        if (auto friendDecl = dyn_cast<clang::FriendDecl>(member))
+          if (auto underlyingDecl = friendDecl->getFriendDecl())
+            member = underlyingDecl;
+
+        if (auto method = dyn_cast<clang::FunctionDecl>(member)) {
           if (method->isOverloadedOperator()) {
             addEntryToLookupTable(*Impl.findLookupTable(decl), method,
                                   Impl.getNameImporter());

lib/ClangImporter/SwiftLookupTable.cpp

@@ -1965,6 +1965,10 @@ void importer::addEntryToLookupTable(SwiftLookupTable &table,
       isa<clang::ObjCCategoryDecl>(named)) {
     clang::DeclContext *dc = cast<clang::DeclContext>(named);
     for (auto member : dc->decls()) {
+      if (auto friendDecl = dyn_cast<clang::FriendDecl>(member))
+        if (auto underlyingDecl = friendDecl->getFriendDecl())
+          member = underlyingDecl;
+
       if (auto namedMember = dyn_cast<clang::NamedDecl>(member))
         addEntryToLookupTable(table, namedMember, nameImporter);
     }

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

@@ -30,7 +30,7 @@ struct LoadableIntWrapper {
   }
 
   // Friend functions
-  friend bool operator==(const LoadableIntWrapper lhs,
+  friend bool operator==(const LoadableIntWrapper &lhs,
                          const LoadableIntWrapper &rhs) {
     return lhs.value == rhs.value;
   }
@@ -45,6 +45,16 @@ struct LoadableIntWrapper {
   }
 };
 
+namespace NS {
+struct IntWrapperInNamespace {
+  int value;
+  friend bool operator==(const IntWrapperInNamespace &lhs,
+                         const IntWrapperInNamespace &rhs) {
+    return lhs.value == rhs.value;
+  }
+};
+} // namespace NS
+
 struct LoadableBoolWrapper {
   bool value;
   LoadableBoolWrapper operator!() {

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

@@ -8,6 +8,10 @@
 // CHECK:   mutating func callAsFunction(_ x: Int32) -> Int32
 // CHECK:   mutating func callAsFunction(_ x: Int32, _ y: Int32) -> Int32
 // CHECK: }
+// CHECK: func == (lhs: LoadableIntWrapper, rhs: LoadableIntWrapper) -> Bool
+// CHECK: func -= (lhs: inout LoadableIntWrapper, rhs: LoadableIntWrapper)
+
+// CHECK: func == (lhs: NS.IntWrapperInNamespace, rhs: NS.IntWrapperInNamespace) -> Bool
 
 // CHECK: struct LoadableBoolWrapper
 // CHECK:   prefix static func ! (lhs: inout LoadableBoolWrapper) -> LoadableBoolWrapper

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

@@ -83,6 +83,15 @@ OperatorsTestSuite.test("LoadableIntWrapper.successor() (inline)") {
   expectEqual(42, wrapper.value)
 }
 
+OperatorsTestSuite.test("IntWrapperInNamespace.equal (inline)") {
+  let lhs = NS.IntWrapperInNamespace(value: 42)
+  let rhs = NS.IntWrapperInNamespace(value: 42)
+
+  let result = lhs == rhs
+
+  expectTrue(result)
+}
+
 OperatorsTestSuite.test("TemplatedWithFriendOperator.equal (inline)") {
   let lhs = TemplatedWithFriendOperatorSpec()
   let rhs = TemplatedWithFriendOperatorSpec()

test/Interop/Cxx/stdlib/print-libcxx-module-interface.swift

@@ -3,7 +3,7 @@
 // REQUIRES: OS=macosx
 
 // CHECK: enum std {
-// CHECK-NEXT: enum __1 {
+// CHECK: enum __1 {
 
 // CHECK: typealias string =
 

test/Interop/Cxx/symbolic-imports/print-libcxx-symbolic-module-interface.swift

@@ -8,7 +8,7 @@
 // REQUIRES: OS=macosx
 
 // CHECK: enum std {
-// CHECK-NEXT: enum __1 {
+// CHECK: enum __1 {
 
 // STRING: struct basic_string {