diff options
| author | Craig Topper <craig.topper@gmail.com> | 2014-04-25 05:29:35 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2014-04-25 05:29:35 +0000 |
| commit | f40110f4d80436071213ed7fcbe367d64aa52c71 (patch) | |
| tree | a4cc1c76e73cdf1ec551d25a89a9954a0396b34a /llvm/lib/Transforms/Scalar/GlobalMerge.cpp | |
| parent | cb7d29d30cafd2ae4babb25e249d0c4b55a80dfc (diff) | |
| download | bcm5719-llvm-f40110f4d80436071213ed7fcbe367d64aa52c71.tar.gz bcm5719-llvm-f40110f4d80436071213ed7fcbe367d64aa52c71.zip | |
[C++] Use 'nullptr'. Transforms edition.
llvm-svn: 207196
Diffstat (limited to 'llvm/lib/Transforms/Scalar/GlobalMerge.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Scalar/GlobalMerge.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Scalar/GlobalMerge.cpp b/llvm/lib/Transforms/Scalar/GlobalMerge.cpp index 8c54d3aecea..dd9c3784cc2 100644 --- a/llvm/lib/Transforms/Scalar/GlobalMerge.cpp +++ b/llvm/lib/Transforms/Scalar/GlobalMerge.cpp @@ -108,7 +108,7 @@ namespace { public: static char ID; // Pass identification, replacement for typeid. - explicit GlobalMerge(const TargetMachine *TM = 0) + explicit GlobalMerge(const TargetMachine *TM = nullptr) : FunctionPass(ID), TM(TM) { initializeGlobalMergePass(*PassRegistry::getPassRegistry()); } @@ -174,7 +174,8 @@ bool GlobalMerge::doMerge(SmallVectorImpl<GlobalVariable*> &Globals, GlobalVariable *MergedGV = new GlobalVariable(M, MergedTy, isConst, GlobalValue::InternalLinkage, MergedInit, "_MergedGlobals", - 0, GlobalVariable::NotThreadLocal, + nullptr, + GlobalVariable::NotThreadLocal, AddrSpace); for (size_t k = i; k < j; ++k) { Constant *Idx[2] = { |
