diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
| commit | c6a4f5e819217e1e12c458aed8e7b122e23a3a58 (patch) | |
| tree | 81b7dd2bb4370a392f31d332a566c903b5744764 /unittests/Linker | |
| parent | 19c6fbb3e8aaf74093afa08013134b61fa08f245 (diff) | |
| download | external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.zip external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.gz external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.bz2 | |
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Diffstat (limited to 'unittests/Linker')
| -rw-r--r-- | unittests/Linker/LinkModulesTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unittests/Linker/LinkModulesTest.cpp b/unittests/Linker/LinkModulesTest.cpp index 1d5db36..4ccced1 100644 --- a/unittests/Linker/LinkModulesTest.cpp +++ b/unittests/Linker/LinkModulesTest.cpp @@ -36,7 +36,7 @@ protected: ArrayType *AT = ArrayType::get(Type::getInt8PtrTy(Ctx), 3); GV = new GlobalVariable(*M.get(), AT, false /*=isConstant*/, - GlobalValue::InternalLinkage, 0, "switch.bas"); + GlobalValue::InternalLinkage, nullptr,"switch.bas"); // Global Initializer std::vector<Constant *> Init; @@ -88,7 +88,7 @@ TEST_F(LinkModuleTest, BlockAddress) { Builder.CreateRet(ConstantPointerNull::get(Type::getInt8PtrTy(Ctx))); Module *LinkedModule = new Module("MyModuleLinked", Ctx); - Linker::LinkModules(LinkedModule, M.get(), Linker::PreserveSource, 0); + Linker::LinkModules(LinkedModule, M.get(), Linker::PreserveSource, nullptr); // Delete the original module. M.reset(); @@ -138,16 +138,16 @@ TEST_F(LinkModuleTest, EmptyModule) { GlobalVariable *GV = new GlobalVariable(*InternalM, STy, false /*=isConstant*/, - GlobalValue::InternalLinkage, 0, "g"); + GlobalValue::InternalLinkage, nullptr, "g"); GV->setInitializer(ConstantStruct::get(STy, F)); Module *EmptyM = new Module("EmptyModule1", Ctx); - Linker::LinkModules(EmptyM, InternalM, Linker::PreserveSource, 0); + Linker::LinkModules(EmptyM, InternalM, Linker::PreserveSource, nullptr); delete EmptyM; EmptyM = new Module("EmptyModule2", Ctx); - Linker::LinkModules(InternalM, EmptyM, Linker::PreserveSource, 0); + Linker::LinkModules(InternalM, EmptyM, Linker::PreserveSource, nullptr); delete EmptyM; delete InternalM; |