summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2017-09-15 21:12:13 +0000
committerReid Kleckner <rnk@google.com>2017-09-15 21:12:13 +0000
commit1efbe2eb05151bf30915eaa9a208bc0a3ab6009c (patch)
tree78092d5c3e04a00d9435d60808aa67a061f29d0c
parent432342b6a81cebece85831144210de50bc366e55 (diff)
downloadbcm5719-llvm-1efbe2eb05151bf30915eaa9a208bc0a3ab6009c.tar.gz
bcm5719-llvm-1efbe2eb05151bf30915eaa9a208bc0a3ab6009c.zip
Fix build for LLVM unittests
llvm-svn: 313397
-rw-r--r--llvm/unittests/Linker/LinkModulesTest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/unittests/Linker/LinkModulesTest.cpp b/llvm/unittests/Linker/LinkModulesTest.cpp
index 67c12b83834..b8e2449437c 100644
--- a/llvm/unittests/Linker/LinkModulesTest.cpp
+++ b/llvm/unittests/Linker/LinkModulesTest.cpp
@@ -98,7 +98,7 @@ TEST_F(LinkModuleTest, BlockAddress) {
Builder.CreateRet(ConstantPointerNull::get(Type::getInt8PtrTy(Ctx)));
Module *LinkedModule = new Module("MyModuleLinked", Ctx);
- Ctx.setDiagnosticHandler(expectNoDiags);
+ Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
Linker::linkModules(*LinkedModule, std::move(M));
// Check that the global "@switch.bas" is well-formed.
@@ -172,14 +172,14 @@ static Module *getInternal(LLVMContext &Ctx) {
TEST_F(LinkModuleTest, EmptyModule) {
std::unique_ptr<Module> InternalM(getInternal(Ctx));
std::unique_ptr<Module> EmptyM(new Module("EmptyModule1", Ctx));
- Ctx.setDiagnosticHandler(expectNoDiags);
+ Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
Linker::linkModules(*EmptyM, std::move(InternalM));
}
TEST_F(LinkModuleTest, EmptyModule2) {
std::unique_ptr<Module> InternalM(getInternal(Ctx));
std::unique_ptr<Module> EmptyM(new Module("EmptyModule1", Ctx));
- Ctx.setDiagnosticHandler(expectNoDiags);
+ Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
Linker::linkModules(*InternalM, std::move(EmptyM));
}
@@ -195,7 +195,7 @@ TEST_F(LinkModuleTest, TypeMerge) {
"@t2 = weak global %t zeroinitializer\n";
std::unique_ptr<Module> M2 = parseAssemblyString(M2Str, Err, C);
- Ctx.setDiagnosticHandler(expectNoDiags);
+ Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
Linker::linkModules(*M1, std::move(M2));
EXPECT_EQ(M1->getNamedGlobal("t1")->getType(),
@@ -280,7 +280,7 @@ TEST_F(LinkModuleTest, MoveDistinctMDs) {
// Link into destination module.
auto Dst = llvm::make_unique<Module>("Linked", C);
ASSERT_TRUE(Dst.get());
- Ctx.setDiagnosticHandler(expectNoDiags);
+ Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
Linker::linkModules(*Dst, std::move(Src));
// Check that distinct metadata was moved, not cloned. Even !4, the uniqued
@@ -349,7 +349,7 @@ TEST_F(LinkModuleTest, RemangleIntrinsics) {
// Link two modules together.
auto Dst = llvm::make_unique<Module>("Linked", C);
ASSERT_TRUE(Dst.get());
- Ctx.setDiagnosticHandler(expectNoDiags);
+ Ctx.setDiagnosticHandlerCallBack(expectNoDiags);
bool Failed = Linker::linkModules(*Foo, std::move(Bar));
ASSERT_FALSE(Failed);
OpenPOWER on IntegriCloud