[llvm-commits] CVS: llvm/lib/VMCore/Linker.cpp

[Chris Lattner]

Changes in directory llvm/lib/VMCore:

Linker.cpp updated: 1.80 -> 1.81
---
Log message:

Fix a major regression in my previous checkin


---
Diffs of the changes:  (+4 -0)

Index: llvm/lib/VMCore/Linker.cpp
diff -u llvm/lib/VMCore/Linker.cpp:1.80 llvm/lib/VMCore/Linker.cpp:1.81
--- llvm/lib/VMCore/Linker.cpp:1.80	Wed Aug  4 03:08:13 2004
+++ llvm/lib/VMCore/Linker.cpp	Wed Aug  4 03:30:43 2004
@@ -411,6 +411,8 @@
         GlobalsByName.find(SGV->getName());
       if (EGV != GlobalsByName.end())
         DGV = dyn_cast<GlobalVariable>(EGV->second);
+      if (DGV && RecursiveResolveTypes(SGV->getType(), DGV->getType(), ST, ""))
+        DGV = 0;  // FIXME: gross.
     }
 
     assert(SGV->hasInitializer() || SGV->hasExternalLinkage() &&
@@ -589,6 +591,8 @@
         GlobalsByName.find(SF->getName());
       if (EF != GlobalsByName.end())
         DF = dyn_cast<Function>(EF->second);
+      if (DF && RecursiveResolveTypes(SF->getType(), DF->getType(), ST, ""))
+        DF = 0;  // FIXME: gross.
     }
 
     if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) {