hmm x2

Author: egorzhdan

lib/ClangImporter/ClangDerivedConformances.cpp

@@ -638,6 +638,10 @@ void swift::conformToCxxIteratorIfNeeded(
   auto distanceTy = minus->getResultInterfaceType();
   // distanceTy conforms to BinaryInteger, this is ensured by getMinusOperator.
 
+  if (clangDecl->getIdentifier() &&
+      clangDecl->getName() == "__normal_iterator") {
+    llvm::errs() << "//// conforming __normal_iterator to UnsafeCxxIter: done minus\n";
+  }
   auto plusEqual = getPlusEqualOperator(decl, distanceTy);
   if (!plusEqual) {
     clang::FunctionDecl *instantiated = instantiateTemplatedOperator(
@@ -658,6 +662,10 @@ void swift::conformToCxxIteratorIfNeeded(
   }
   if (!plusEqual)
     return;
+  if (clangDecl->getIdentifier() &&
+      clangDecl->getName() == "__normal_iterator") {
+    llvm::errs() << "//// conforming __normal_iterator to UnsafeCxxIter: done plusEqual\n";
+  }
 
   impl.addSynthesizedTypealias(decl, ctx.getIdentifier("Distance"), distanceTy);
   if (pointeeSettable)
@@ -1133,8 +1141,11 @@ void swift::conformToCxxVectorIfNeeded(ClangImporter::Implementation &impl,
   auto rawIteratorTy = iterType->getUnderlyingType();
 
   // Check if RawIterator conforms to UnsafeCxxRandomAccessIterator.
-  if (!checkConformance(rawIteratorTy, cxxRandomAccessIteratorProto))
+  if (!checkConformance(rawIteratorTy, cxxRandomAccessIteratorProto)) {
+    llvm::errs() << "!!! !!! !!! RawIterator does not conform:\n";
+    rawIteratorTy->getAnyNominal()->dump(llvm::errs());
     return;
+  }
 
   impl.addSynthesizedTypealias(decl, ctx.Id_Element,
                                valueType->getUnderlyingType());

lib/ClangImporter/ImportDecl.cpp

@@ -2545,6 +2545,10 @@ namespace {
         }
       }
 
+      if (decl->getIdentifier() &&
+          decl->getName() == "__normal_iterator") {
+        llvm::errs() << "//// IMPORTED __normal_iterator\n";
+      }
       result->setMemberLoader(&Impl, 0);
       return result;
     }
@@ -2888,6 +2892,7 @@ namespace {
       auto result = VisitRecordDecl(decl);
       if (!result)
         return nullptr;
+      Impl.ImportedDecls[{decl, getVersion()}] = result;
 
       if (decl->hasAttr<clang::TrivialABIAttr>()) {
         // We cannot yet represent trivial_abi C++ records in Swift.
@@ -2939,6 +2944,12 @@ namespace {
 
       if (auto *ntd = dyn_cast<NominalTypeDecl>(result))
         addExplicitProtocolConformances(ntd, decl);
+      
+      if (decl->getIdentifier() && decl->isInStdNamespace() &&
+          decl->getName() == "vector") {
+        llvm::errs() << "//// IMPORTED vector\n";
+        decl->dump(llvm::errs());
+      }
 
       return result;
     }