Clean up & add test

Author: Huddie

lib/ClangImporter/ImportDecl.cpp

@@ -3651,16 +3651,6 @@ namespace {
         }
       }
 
-      //
-//      for (auto &cxxMethod : Impl.cxxMethods) {
-//        for (auto &mutFuncPtr : cxxMethod.getSecond().second) {
-//          Decl *member =
-//              Impl.importDecl(mutFuncPtr->getUnderlyingDecl(),
-//                              getActiveSwiftVersion());
-//            if(member)
-//              result->addMemberToLookupTable(member);
-//        }
-//      }
       result->setMemberLoader(&Impl, 0);
       return result;
     }

test/Interop/Cxx/class/method/ambiguous-methods.swift

@@ -8,20 +8,37 @@ import AmbiguousMethods
 
 var CxxAmbiguousMethodTestSuite = TestSuite("CxxAmbiguousMethods")
 
+// It's important to check that both calling the const version first
+// and the mutable version first pass. This helps confirm that the lookup
+// table is being properly seeded.
+CxxAmbiguousMethodTestSuite.test("ping const first") {
+  var instance = HasAmbiguousMethods()
+
+  instance.ping()
+  instance.pingMutable()
+  expectEqual(1, instance.numberOfMutableMethodsCalled())
+}
+
+CxxAmbiguousMethodTestSuite.test("ping mutable first") {
+  var instance = HasAmbiguousMethods()
+
+  instance.pingMutable()
+  instance.ping()
+  expectEqual(1, instance.numberOfMutableMethodsCalled())
+}
+
 CxxAmbiguousMethodTestSuite.test("numberOfMutableMethodsCalled: () -> Int") {
   var instance = HasAmbiguousMethods()
 
   // Sanity check. Make sure we start at 0
+  // and that calling numberOfMutableMethodsCalled doesn't change
+  // the count
   expectEqual(0, instance.numberOfMutableMethodsCalled())
-
-  // Make sure calling numberOfMutableMethodsCalled above didn't
-  // change the count
   expectEqual(0, instance.numberOfMutableMethodsCalled())
 
   // Check that mutable version _does_ change the mutable call count
+  expectEqual(0, instance.numberOfMutableMethodsCalled())
   expectEqual(1, instance.numberOfMutableMethodsCalledMutating())
-
-  expectEqual(1, instance.numberOfMutableMethodsCalled())
 }
 
 CxxAmbiguousMethodTestSuite.test("Basic Increment: (Int) -> Int") {