summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2014-04-25 05:30:21 +0000
committerCraig Topper <craig.topper@gmail.com>2014-04-25 05:30:21 +0000
commit062a2baef02b0f2ed21aa5c5d61460ac02d2880b (patch)
treeb5036bb342cded5422fa4d432562959b3be5086b /llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
parentf40110f4d80436071213ed7fcbe367d64aa52c71 (diff)
downloadbcm5719-llvm-062a2baef02b0f2ed21aa5c5d61460ac02d2880b.tar.gz
bcm5719-llvm-062a2baef02b0f2ed21aa5c5d61460ac02d2880b.zip
[C++] Use 'nullptr'. Target edition.
llvm-svn: 207197
Diffstat (limited to 'llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp')
-rw-r--r--llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp b/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
index 45f0734c16c..4209ba36024 100644
--- a/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
@@ -88,7 +88,8 @@ bool GenericToNVVM::runOnModule(Module &M) {
!GV->getName().startswith("llvm.")) {
GlobalVariable *NewGV = new GlobalVariable(
M, GV->getType()->getElementType(), GV->isConstant(),
- GV->getLinkage(), GV->hasInitializer() ? GV->getInitializer() : NULL,
+ GV->getLinkage(),
+ GV->hasInitializer() ? GV->getInitializer() : nullptr,
"", GV, GV->getThreadLocalMode(), llvm::ADDRESS_SPACE_GLOBAL);
NewGV->copyAttributesFrom(GV);
GVMap[GV] = NewGV;
@@ -162,7 +163,7 @@ Value *GenericToNVVM::getOrInsertCVTA(Module *M, Function *F,
GlobalVariable *GV,
IRBuilder<> &Builder) {
PointerType *GVType = GV->getType();
- Value *CVTA = NULL;
+ Value *CVTA = nullptr;
// See if the address space conversion requires the operand to be bitcast
// to i8 addrspace(n)* first.
OpenPOWER on IntegriCloud