Rename getNullPointer to getNull

[oota-llvm.git] / lib / VMCore / ConstPoolVals.cpp

diff --git a/lib/VMCore/ConstPoolVals.cpp b/lib/VMCore/ConstPoolVals.cpp
index 6c054e1ee07f0b4fe249cc32a6061f4fab11aa21..eeb7a43069fa0c6d95951650494f5e993fded04d 100644 (file)
--- a/lib/VMCore/ConstPoolVals.cpp
+++ b/lib/VMCore/ConstPoolVals.cpp
@@ -46,7 +46,7 @@ ConstPoolVal *ConstPoolVal::getNullConstant(const Type *Ty) {
   case Type::DoubleTyID: return ConstPoolFP::get(Ty, 0);
 
   case Type::PointerTyID: 
-    return ConstPoolPointer::getNullPointer(cast<PointerType>(Ty));
+    return ConstPoolPointer::getNull(cast<PointerType>(Ty));
   default:
     return 0;
   }
@@ -331,3 +331,15 @@ ConstPoolStruct *ConstPoolStruct::get(const StructType *Ty,
     StructConstants.add(Ty, V, Result = new ConstPoolStruct(Ty, V));
   return Result;
 }
+
+//---- ConstPoolPointer::get() implementation...
+//
+static ValueMap<char, ConstPoolPointer> NullPtrConstants;
+
+ConstPoolPointer *ConstPoolPointer::getNull(const PointerType *Ty) {
+  ConstPoolPointer *Result = NullPtrConstants.get(Ty, 0);
+  if (!Result)   // If no preexisting value, create one now...
+    NullPtrConstants.add(Ty, 0, Result = new ConstPoolPointer(Ty));
+  return Result;
+}
+