diff --git a/lib/Transforms/IPO/IPConstantPropagation.cpp b/lib/Transforms/IPO/IPConstantPropagation.cpp
index 026dbe3e803..0195231701f 100644
--- a/lib/Transforms/IPO/IPConstantPropagation.cpp
+++ b/lib/Transforms/IPO/IPConstantPropagation.cpp
@@ -82,9 +82,8 @@ bool IPCP::processFunction(Function &F) {
         if (*AI == &F) return false;  // Passes the function into itself
 
         if (!ArgumentConstants[i].second) {
-          if (isa<Constant>(*AI) || isa<GlobalValue>(*AI)) {
+          if (isa<Constant>(*AI)) {
             Constant *C = dyn_cast<Constant>(*AI);
-            if (!C) C = ConstantPointerRef::get(cast<GlobalValue>(*AI));
             
             if (!ArgumentConstants[i].first)
               ArgumentConstants[i].first = C;
@@ -114,9 +113,6 @@ bool IPCP::processFunction(Function &F) {
     if (!ArgumentConstants[i].second && !AI->use_empty()) {
       assert(ArgumentConstants[i].first && "Unknown constant value!");
       Value *V = ArgumentConstants[i].first;
-      if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(V))
-        V = CPR->getValue();
-
       AI->replaceAllUsesWith(V);
       ++NumArgumentsProped;
       MadeChange = true;
diff --git a/lib/Transforms/IPO/InlineSimple.cpp b/lib/Transforms/IPO/InlineSimple.cpp
index c0d97c5515b..791b21356e6 100644
--- a/lib/Transforms/IPO/InlineSimple.cpp
+++ b/lib/Transforms/IPO/InlineSimple.cpp
@@ -78,8 +78,7 @@ static unsigned CountCodeReductionForConstant(Value *V) {
       Instruction &Inst = cast<Instruction>(**UI);
       bool AllOperandsConstant = true;
       for (unsigned i = 0, e = Inst.getNumOperands(); i != e; ++i)
-        if (!isa<Constant>(Inst.getOperand(i)) &&
-            !isa<GlobalValue>(Inst.getOperand(i)) && Inst.getOperand(i) != V) {
+        if (!isa<Constant>(Inst.getOperand(i)) && Inst.getOperand(i) != V) {
           AllOperandsConstant = false;
           break;
         }
@@ -205,7 +204,7 @@ int SimpleInliner::getInlineCost(CallSite CS) {
     // If this is a constant being passed into the function, use the argument
     // weights calculated for the callee to determine how much will be folded
     // away with this information.
-    } else if (isa<Constant>(I) || isa<GlobalVariable>(I)) {
+    } else if (isa<Constant>(I)) {
       if (ArgNo < CalleeFI.ArgumentWeights.size())
         InlineCost -= CalleeFI.ArgumentWeights[ArgNo].ConstantWeight;
     }
diff --git a/lib/Transforms/Scalar/GCSE.cpp b/lib/Transforms/Scalar/GCSE.cpp
index 7d93c50373e..c24941320fc 100644
--- a/lib/Transforms/Scalar/GCSE.cpp
+++ b/lib/Transforms/Scalar/GCSE.cpp
@@ -78,8 +78,7 @@ bool GCSE::runOnFunction(Function &F) {
       VN.getEqualNumberNodes(AI, EqualValues);
       if (!EqualValues.empty()) {
         for (unsigned i = 0, e = EqualValues.size(); i != e; ++i)
-          if (isa<Constant>(EqualValues[i]) ||
-              isa<GlobalValue>(EqualValues[i])) {
+          if (isa<Constant>(EqualValues[i])) {
             AI->replaceAllUsesWith(EqualValues[i]);
             ++NumArgsRepl;
             Changed = true;
@@ -186,7 +185,7 @@ void GCSE::ReplaceInstructionWith(Instruction *I, Value *V) {
 
   // If we are not replacing the instruction with a constant, we cannot do
   // anything special.
-  if (!isa<Constant>(V)) {
+  if (!isa<Constant>(V) || isa<GlobalValue>(V)) {
     I->replaceAllUsesWith(V);
 
     if (InvokeInst *II = dyn_cast<InvokeInst>(I)) {
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index c3ed43d1f0c..cc28e54c374 100644
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -211,8 +211,7 @@ static bool DominatesMergePoint(Value *V, BasicBlock *BB, bool AllowAggressive){
         if (cast<LoadInst>(I)->isVolatile())
           return false;
         if (!isa<AllocaInst>(I->getOperand(0)) &&
-            !isa<Constant>(I->getOperand(0)) &&
-            !isa<GlobalValue>(I->getOperand(0)))
+            !isa<Constant>(I->getOperand(0)))
           return false;
 
         // Finally, we have to check to make sure there are no instructions