Stop reimport of func decl

Author: Huddie

lib/ClangImporter/ClangImporter.cpp

@@ -4977,7 +4977,7 @@ ValueDecl *cloneBaseMemberDecl(ValueDecl *decl, DeclContext *newContext) {
     // support these we need to tell Swift to type check the synthesized bodies.
     // TODO: we also currently don't support static functions. That shouldn't be
     // too hard.
-    if (fn->isStatic() ||
+    if (fn->isStatic() || cast<clang::FunctionDecl>(fn->getClangDecl())->isOverloadedOperator() ||
         (fn->getClangDecl() &&
          isa<clang::FunctionTemplateDecl>(fn->getClangDecl())))
       return nullptr;

lib/ClangImporter/ImportDecl.cpp

@@ -4153,6 +4153,13 @@ namespace {
       if (!dc)
         return nullptr;
 
+      // We may have already imported this function decl before we imported the
+      // parent record. In such a case it's important we don't re-import.
+      auto known = Impl.ImportedDecls.find({decl, getVersion()});
+      if (known != Impl.ImportedDecls.end()) {
+        return known->second;
+      }
+
       bool isOperator = decl->getDeclName().getNameKind() ==
                         clang::DeclarationName::CXXOperatorName;
       bool isNonSubscriptOperator =

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

@@ -43,6 +43,10 @@ struct AddressOnlyIntWrapper {
   int operator()(int x, int y) {
     return value + x * y;
   }
+
+  AddressOnlyIntWrapper operator-(AddressOnlyIntWrapper rhs) const {
+    return AddressOnlyIntWrapper(value - rhs.value);
+  }
 };
 
 struct HasDeletedOperator {
@@ -274,4 +278,4 @@ struct DerivedFromReadWriteIntArray : ReadWriteIntArray {};
 
 struct DerivedFromNonTrivialArrayByVal : NonTrivialArrayByVal {};
 
-#endif
+#endif

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

@@ -8,7 +8,7 @@ import StdlibUnittest
 var OperatorsTestSuite = TestSuite("Operators")
 
 #if !os(Windows)    // SR-13129
-OperatorsTestSuite.test("LoadableIntWrapper.plus (inline)") {
+OperatorsTestSuite.test("LoadableIntWrapper.minus (inline)") {
   var lhs = LoadableIntWrapper(value: 42)
   let rhs = LoadableIntWrapper(value: 23)
 
@@ -231,6 +231,14 @@ OperatorsTestSuite.test("PtrToPtr.subscript (inline)") {
   expectEqual(23, arr[0]![0]![0])
 }
 
+OperatorsTestSuite.test("AddressOnlyIntWrapper.minus") {
+   let lhs = AddressOnlyIntWrapper(42)
+   let rhs = AddressOnlyIntWrapper(23)
+
+   let result = lhs - rhs
+   expectEqual(19, result.value)
+ }
+
 // TODO: this causes a crash (does it also crash on main?)
 //OperatorsTestSuite.test("TemplatedSubscriptArrayByVal.subscript (inline)") {
 //  let ptr: UnsafeMutablePointer<Int32> =