[llvm] r313397 - Fix build for LLVM unittests

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Fri Sep 15 14:12:13 2017
New Revision: 313397

URL: http://llvm.org/viewvc/llvm-project?rev=313397&view=rev
Log:
Fix build for LLVM unittests

Modified:
    llvm/trunk/unittests/Linker/LinkModulesTest.cpp

Modified: llvm/trunk/unittests/Linker/LinkModulesTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Linker/LinkModulesTest.cpp?rev=313397&r1=313396&r2=313397&view=diff
==============================================================================
--- llvm/trunk/unittests/Linker/LinkModulesTest.cpp (original)
+++ llvm/trunk/unittests/Linker/LinkModulesTest.cpp Fri Sep 15 14:12:13 2017
@@ -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 &
 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, RemangleIntrinsic
   // 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);