Rip out EmittedDeferredDecls; decls are now kept in DeferredDecls.

This partially reverts e522ed4, 2f9604c, e848d13.

Author: Axel-Naumann

interpreter/llvm/src/tools/clang/lib/CodeGen/CodeGenModule.cpp

@@ -1970,7 +1970,6 @@ CodeGenModule::GetOrCreateLLVMFunction(StringRef MangledName,
       // DeferredDeclsToEmit list, and remove it from DeferredDecls (since we
       // don't need it anymore).
       addDeferredDeclToEmit(F, DDI->second);
-      EmittedDeferredDecls[F] = std::make_pair(DDI->first, DDI->second);
       //DeferredDecls.erase(DDI);
 
       // Otherwise, there are cases we have to worry about where we're
@@ -2168,7 +2167,6 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName,
     // Move the potentially referenced deferred decl to the DeferredDeclsToEmit
     // list, and remove it from DeferredDecls (since we don't need it anymore).
     addDeferredDeclToEmit(GV, DDI->second);
-    EmittedDeferredDecls[GV] = std::make_pair(DDI->first, DDI->second);
     //DeferredDecls.erase(DDI);
   }
 

interpreter/llvm/src/tools/clang/lib/CodeGen/CodeGenModule.h

@@ -322,14 +322,6 @@ class CodeGenModule : public CodeGenTypeCache {
     DeferredDeclsToEmit.emplace_back(GV, GD);
   }
 
-  /// Enables unloading of emitted symbols that need to become deferred.
-  /// Key is the emitted definition, value is symbol name + Decl created
-  /// while marking this deferred, i.e. the content of DeferredDecls.
-  std::unordered_map<llvm::GlobalValue*,
-                     std::pair<llvm::StringRef, GlobalDecl>>
-    EmittedDeferredDecls;
-
-
   /// List of alias we have emitted. Used to make sure that what they point to
   /// is defined once we get to the end of the of the translation unit.
   std::vector<GlobalDecl> Aliases;

interpreter/llvm/src/tools/clang/lib/CodeGen/ModuleBuilder.cpp

@@ -151,8 +151,6 @@ namespace clang {
              && "Newly created module should not have weakRefRefs");
       Builder->WeakRefReferences.swap(OldBuilder->WeakRefReferences);
 
-      Builder->EmittedDeferredDecls.swap(OldBuilder->EmittedDeferredDecls);
-
       return M.get();
     }
 
@@ -287,27 +285,13 @@ namespace clang {
         }
       }
 
-      if (GV->isWeakForLinker()) {
-        if (!GV->isDeclaration()) {
-          // This is a definition. If if was emitted as deferred, move it
-          // back into deferred state.
-          auto IEmittedDeferredDecl
-            = Builder->EmittedDeferredDecls.find(GV);
-          if (IEmittedDeferredDecl != Builder->EmittedDeferredDecls.end()) {
-            // Use the name of the original GV, not that of our definition
-            // that's soon to be erased.
-            Builder->DeferredDecls[IEmittedDeferredDecl->second.first]
-              = IEmittedDeferredDecl->second.second;
-            Builder->EmittedDeferredDecls.erase(IEmittedDeferredDecl);
-          }
-        } else {
-          // might be an entry in the deferred decls, if so: remove!
-          auto IDeferredDecl = Builder->DeferredDecls.find(GV->getName());
-          if (IDeferredDecl != Builder->DeferredDecls.end()) {
-            // yes, pointer comparison.
-            if (IDeferredDecl->first.data() == GV->getName().data())
-              Builder->DeferredDecls.erase(IDeferredDecl);
-          }
+      if (GV->isWeakForLinker() && GV->isDeclaration()) {
+        // might be an entry in the deferred decls, if so: remove!
+        auto IDeferredDecl = Builder->DeferredDecls.find(GV->getName());
+        if (IDeferredDecl != Builder->DeferredDecls.end()) {
+          // yes, pointer comparison.
+          if (IDeferredDecl->first.data() == GV->getName().data())
+            Builder->DeferredDecls.erase(IDeferredDecl);
         }
       }
     }