commit f37b84beca34a0d964a3cf9d17f13efe341e2e37
author Owen Anderson <resistor@mac.com> Fri Jul 31 20:28:54 2009 +0000
committer Owen Anderson <resistor@mac.com> Fri Jul 31 20:28:54 2009 +0000
tree 4d85d56ca6aee06dbf8d7e691a73daa53f07e571
parent d14377d517258881ca44f2f8a76968383943815c

Update for LLVM API change.


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

lib/CodeGen/CGCXX.cpp

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index 88d36a2..6c0c0d9 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -41,7 +41,7 @@
   llvm::GlobalValue *GuardV = 
     new llvm::GlobalVariable(CGM.getModule(), llvm::Type::Int64Ty, false,
                              GV->getLinkage(),
-                             VMContext.getNullValue(llvm::Type::Int64Ty),
+                             llvm::Constant::getNullValue(llvm::Type::Int64Ty),
                              GuardVName.c_str());
   
   // Load the first byte of the guard variable.
@@ -50,7 +50,7 @@
                                       "tmp");
   
   // Compare it against 0.
-  llvm::Value *nullValue = VMContext.getNullValue(llvm::Type::Int8Ty);
+  llvm::Value *nullValue = llvm::Constant::getNullValue(llvm::Type::Int8Ty);
   llvm::Value *ICmp = Builder.CreateICmpEQ(V, nullValue , "tobool");
   
   llvm::BasicBlock *InitBlock = createBasicBlock("init");
@@ -342,7 +342,7 @@
     
     llvm::Value *IsNull = 
       Builder.CreateICmpEQ(NewPtr, 
-                           VMContext.getNullValue(NewPtr->getType()),
+                           llvm::Constant::getNullValue(NewPtr->getType()),
                            "isnull");
     
     Builder.CreateCondBr(IsNull, NewNull, NewNotNull);
@@ -383,7 +383,7 @@
     llvm::PHINode *PHI = Builder.CreatePHI(NewPtr->getType());
     PHI->reserveOperandSpace(2);
     PHI->addIncoming(NewPtr, NewNotNull);
-    PHI->addIncoming(VMContext.getNullValue(NewPtr->getType()), NewNull);
+    PHI->addIncoming(llvm::Constant::getNullValue(NewPtr->getType()), NewNull);
     
     NewPtr = PHI;
   }