bug 122:

- Replace ConstantPointerRef usage with GlobalValue usage
- Correct isa<Constant> for GlobalValue subclass

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14930 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index b241d9e333db6eb03781e171825efedc371d42a8..4cd852cbb2f965f3fa042a5bfdaf115a6a411436 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -307,10 +307,8 @@ static Value *RemapOperand(const Value *In,
       Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands);
     } else if (isa<ConstantPointerNull>(CPV)) {
       Result = const_cast<Constant*>(CPV);
-    } else if (const ConstantPointerRef *CPR =
-                      dyn_cast<ConstantPointerRef>(CPV)) {
-      Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap);
-      Result = ConstantPointerRef::get(cast<GlobalValue>(V));
+    } else if (isa<GlobalValue>(CPV)) {
+      Result = cast<Constant>(RemapOperand(CPV, LocalMap, GlobalMap));
     } else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) {
       if (CE->getOpcode() == Instruction::GetElementPtr) {
         Value *Ptr = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap);
@@ -834,9 +832,8 @@ static bool LinkAppendingVars(Module *M,
 
       // FIXME: This should rewrite simple/straight-forward uses such as
       // getelementptr instructions to not use the Cast!
-      ConstantPointerRef *NGCP = ConstantPointerRef::get(NG);
-      G1->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G1->getType()));
-      G2->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G2->getType()));
+      G1->replaceAllUsesWith(ConstantExpr::getCast(NG, G1->getType()));
+      G2->replaceAllUsesWith(ConstantExpr::getCast(NG, G2->getType()));
 
       // Remove the two globals from the module now...
       M->getGlobalList().erase(G1);

diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index b241d9e333db6eb03781e171825efedc371d42a8..4cd852cbb2f965f3fa042a5bfdaf115a6a411436 100644 (file)
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -307,10 +307,8 @@ static Value *RemapOperand(const Value *In,
       Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands);
     } else if (isa<ConstantPointerNull>(CPV)) {
       Result = const_cast<Constant*>(CPV);
-    } else if (const ConstantPointerRef *CPR =
-                      dyn_cast<ConstantPointerRef>(CPV)) {
-      Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap);
-      Result = ConstantPointerRef::get(cast<GlobalValue>(V));
+    } else if (isa<GlobalValue>(CPV)) {
+      Result = cast<Constant>(RemapOperand(CPV, LocalMap, GlobalMap));
     } else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) {
       if (CE->getOpcode() == Instruction::GetElementPtr) {
         Value *Ptr = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap);
@@ -834,9 +832,8 @@ static bool LinkAppendingVars(Module *M,
 
       // FIXME: This should rewrite simple/straight-forward uses such as
       // getelementptr instructions to not use the Cast!
-      ConstantPointerRef *NGCP = ConstantPointerRef::get(NG);
-      G1->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G1->getType()));
-      G2->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G2->getType()));
+      G1->replaceAllUsesWith(ConstantExpr::getCast(NG, G1->getType()));
+      G2->replaceAllUsesWith(ConstantExpr::getCast(NG, G2->getType()));
 
       // Remove the two globals from the module now...
       M->getGlobalList().erase(G1);