Fix a bug introduced by "internal linkage" work.

[oota-llvm.git] / lib / Transforms / Utils / Linker.cpp

diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index 5e0178ae6d77d1d53020f6b65045f0d31845828d..f04c8a46a3140f74ebc1a00cc648d1ee971107e2 100644 (file)
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -16,7 +16,7 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/iOther.h"
-#include "llvm/ConstPoolVals.h"
+#include "llvm/ConstantVals.h"
 
 // Error - Simple wrapper function to conditionally assign to E and return true.
 // This just makes error return conditions a little bit simpler...
@@ -90,31 +90,31 @@ static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
   }
 
   // Check to see if it's a constant that we are interesting in transforming...
-  if (ConstPoolVal *CPV = dyn_cast<ConstPoolVal>(In)) {
+  if (Constant *CPV = dyn_cast<Constant>(In)) {
     if (!isa<DerivedType>(CPV->getType()))
       return CPV;              // Simple constants stay identical...
 
-    ConstPoolVal *Result = 0;
+    Constant *Result = 0;
 
-    if (ConstPoolArray *CPA = dyn_cast<ConstPoolArray>(CPV)) {
+    if (ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) {
       const vector<Use> &Ops = CPA->getValues();
-      vector<ConstPoolVal*> Operands(Ops.size());
+      vector<Constant*> Operands(Ops.size());
       for (unsigned i = 0; i < Ops.size(); ++i)
         Operands[i] = 
-          cast<ConstPoolVal>(RemapOperand(Ops[i], LocalMap, GlobalMap));
-      Result = ConstPoolArray::get(cast<ArrayType>(CPA->getType()), Operands);
-    } else if (ConstPoolStruct *CPS = dyn_cast<ConstPoolStruct>(CPV)) {
+          cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
+      Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands);
+    } else if (ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
       const vector<Use> &Ops = CPS->getValues();
-      vector<ConstPoolVal*> Operands(Ops.size());
+      vector<Constant*> Operands(Ops.size());
       for (unsigned i = 0; i < Ops.size(); ++i)
         Operands[i] = 
-          cast<ConstPoolVal>(RemapOperand(Ops[i], LocalMap, GlobalMap));
-      Result = ConstPoolStruct::get(cast<StructType>(CPS->getType()), Operands);
-    } else if (isa<ConstPoolPointerNull>(CPV)) {
+          cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
+      Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands);
+    } else if (isa<ConstantPointerNull>(CPV)) {
       Result = CPV;
-    } else if (ConstPoolPointerRef *CPR = dyn_cast<ConstPoolPointerRef>(CPV)) {
+    } else if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(CPV)) {
       Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap);
-      Result = ConstPoolPointerRef::get(cast<GlobalValue>(V));
+      Result = ConstantPointerRef::get(cast<GlobalValue>(V));
     } else {
       assert(0 && "Unknown type of derived type constant value!");
     }
@@ -156,7 +156,9 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
     // If the global variable has a name, and that name is already in use in the
     // Dest module, make sure that the name is a compatible global variable...
     //
-    if (SGV->hasName() && (V = ST->lookup(SGV->getType(), SGV->getName()))) {
+    if (SGV->hasExternalLinkage() && SGV->hasName() &&
+       (V = ST->lookup(SGV->getType(), SGV->getName())) &&
+       cast<GlobalVariable>(V)->hasExternalLinkage()) {
       // The same named thing is a global variable, because the only two things
       // that may be in a module level symbol table are Global Vars and Methods,
       // and they both have distinct, nonoverlapping, possible types.
@@ -177,8 +179,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
       // later by LinkGlobalInits...
       //
       GlobalVariable *DGV = 
-        new GlobalVariable(SGV->getType()->getValueType(), SGV->isConstant(),
-                           0, SGV->getName());
+        new GlobalVariable(SGV->getType()->getElementType(), SGV->isConstant(),
+                           SGV->hasInternalLinkage(), 0, SGV->getName());
 
       // Add the new global to the dest module
       Dest->getGlobalList().push_back(DGV);
@@ -205,11 +207,12 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src,
 
     if (SGV->hasInitializer()) {      // Only process initialized GV's
       // Figure out what the initializer looks like in the dest module...
-      ConstPoolVal *DInit =
-        cast<ConstPoolVal>(RemapOperand(SGV->getInitializer(), ValueMap));
+      Constant *DInit =
+        cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap));
 
       GlobalVariable *DGV = cast<GlobalVariable>(ValueMap[SGV]);    
-      if (DGV->hasInitializer()) {
+      if (DGV->hasInitializer() && SGV->hasExternalLinkage() &&
+         DGV->hasExternalLinkage()) {
         if (DGV->getInitializer() != DInit)
           return Error(Err, "Global Variable Collision on '" + 
                        SGV->getType()->getDescription() + "':%" +SGV->getName()+
@@ -243,7 +246,9 @@ static bool LinkMethodProtos(Module *Dest, const Module *Src,
     // If the method has a name, and that name is already in use in the
     // Dest module, make sure that the name is a compatible method...
     //
-    if (SM->hasName() && (V = ST->lookup(SM->getType(), SM->getName()))) {
+    if (SM->hasExternalLinkage() && SM->hasName() &&
+       (V = ST->lookup(SM->getType(), SM->getName())) &&
+       cast<Method>(V)->hasExternalLinkage()) {
       // The same named thing is a Method, because the only two things
       // that may be in a module level symbol table are Global Vars and Methods,
       // and they both have distinct, nonoverlapping, possible types.
@@ -261,7 +266,8 @@ static bool LinkMethodProtos(Module *Dest, const Module *Src,
     } else {
       // Method does not already exist, simply insert an external method
       // signature identical to SM into the dest module...
-      Method *DM = new Method(SM->getMethodType(), SM->getName());
+      Method *DM = new Method(SM->getMethodType(), SM->hasInternalLinkage(),
+                             SM->getName());
 
       // Add the method signature to the dest module...
       Dest->getMethodList().push_back(DM);