2 files changed, 7 insertions, 8 deletions
diff --git a/lib/Transforms/Instrumentation/TraceValues.cpp b/lib/Transforms/Instrumentation/TraceValues.cpp
index 0cd395b404..1c47f96509 100644
--- a/lib/Transforms/Instrumentation/TraceValues.cpp
+++ b/lib/Transforms/Instrumentation/TraceValues.cpp
@@ -41,10 +41,10 @@ const char* const PRINTF = "printf";
 
 #undef USE_PTRREF
 #ifdef USE_PTRREF
-static inline ConstPoolPointerReference*
+static inline ConstPoolPointerRef*
 GetStringRef(Module* module, const char* str)
 {
-  static hash_map<string, ConstPoolPointerReference*> stringRefCache;
+  static hash_map<string, ConstPoolPointerRef*> stringRefCache;
   static Module* lastModule = NULL;
   
   if (lastModule != module)
@@ -53,14 +53,14 @@ GetStringRef(Module* module, const char* str)
       lastModule = module;
     }
   
-  ConstPoolPointerReference* result = stringRefCache[str];
+  ConstPoolPointerRef* result = stringRefCache[str];
   if (result == NULL)
     {
       ConstPoolArray* charArray = ConstPoolArray::get(str);
       GlobalVariable* stringVar =
         new GlobalVariable(charArray->getType(),/*isConst*/true,charArray,str);
       module->getGlobalList().push_back(stringVar);
-      result = ConstPoolPointerReference::get(stringVar);
+      result = ConstPoolPointerRef::get(stringVar);
       assert(result && "Failed to create reference to string constant");
       stringRefCache[str] = result;
     }
@@ -89,7 +89,7 @@ GetStringRef(Module* module, const char* str)
         new GlobalVariable(charArray->getType(),/*isConst*/true,charArray);
       module->getGlobalList().push_back(stringVar);
       result = stringVar;
-      // result = ConstPoolPointerReference::get(stringVar);
+      // result = ConstPoolPointerRef::get(stringVar);
       assert(result && "Failed to create reference to string constant");
       stringRefCache[str] = result;
     }
diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index 9f36604f8c..33acbb4afb 100644
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -64,10 +64,9 @@ static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
       Result = ConstPoolStruct::get(cast<StructType>(CPS->getType()), Operands);
     } else if (isa<ConstPoolPointerNull>(CPV)) {
       Result = CPV;
-    } else if (ConstPoolPointerReference *CPR = 
-               dyn_cast<ConstPoolPointerReference>(CPV)) {
+    } else if (ConstPoolPointerRef *CPR = dyn_cast<ConstPoolPointerRef>(CPV)) {
       Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap);
-      Result = ConstPoolPointerReference::get(cast<GlobalValue>(V));
+      Result = ConstPoolPointerRef::get(cast<GlobalValue>(V));
     } else {
       assert(0 && "Unknown type of derived type constant value!");
     }