bug 122:

- Replace ConstantPointerRef usage with GlobalValue usage
- Correct test ordering for GlobalValue subclass

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

diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp
index 8e11bf3d45194b3dc649a3819a55129f752c7989..24beee5a8bedec664b52a17610c520d4cf5fda01 100644 (file)
--- a/lib/Transforms/LevelRaise.cpp
+++ b/lib/Transforms/LevelRaise.cpp
@@ -528,8 +528,6 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
       Constant *ConstantCallSrc = 0;
       if (Constant *CS = dyn_cast<Constant>(CI->getCalledValue()))
         ConstantCallSrc = CS;
-      else if (GlobalValue *GV = dyn_cast<GlobalValue>(CI->getCalledValue()))
-        ConstantCallSrc = ConstantPointerRef::get(GV);
 
       if (ConstantCallSrc)
         NewCast = ConstantExpr::getCast(ConstantCallSrc, NewPFunTy);
@@ -537,10 +535,6 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
         NewCast = new CastInst(CI->getCalledValue(), NewPFunTy,
                                CI->getCalledValue()->getName()+"_c",CI);
 
-      // Strip off unneeded CPR's.
-      if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(NewCast))
-        NewCast = CPR->getValue();
-
       // Create a new call instruction...
       CallInst *NewCall = new CallInst(NewCast,
                            std::vector<Value*>(CI->op_begin()+1, CI->op_end()));