commit 6391c7e2a13ad00af853d0eeff718ddde8807da6
author Frederich Munch <colsebas@hotmail.com> Tue Jun 13 19:05:24 2017 +0000
committer Frederich Munch <colsebas@hotmail.com> Tue Jun 13 19:05:24 2017 +0000
tree 463ff64f523a2a3b73ef686b79a28f07d5c99cba
parent 769d8d185c899e49f118d6f471e238a5780610ef

Revert r305313 & r305303, self-hosting build-bot isn’t liking it.

llvm-svn: 305318

llvm/unittests/Support/DynamicLibrary/CMakeLists.txt

diff --git a/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt b/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt
index e8441d9..b5844381 100644
--- a/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt
+++ b/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS Support IPO)
+set(LLVM_LINK_COMPONENTS Support)
 
 add_library(DynamicLibraryLib STATIC ExportedFuncs.cxx)
 
@@ -20,7 +20,6 @@
     )
 
   add_dependencies(DynamicLibraryTests ${NAME})
-  llvm_update_compile_flags(${NAME})
 endfunction(dynlib_add_module)
 
 dynlib_add_module(PipSqueak)

llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

diff --git a/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp b/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
index 5730d61..c54e1b7 100644
--- a/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+++ b/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
@@ -12,7 +12,6 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "gtest/gtest.h"
 
 #include "PipSqueak.h"
@@ -53,28 +52,6 @@
   return Tmp.P;
 }
 
-static void
-NoPassRegistration(const PassManagerBuilder &, legacy::PassManagerBase &) {
-}
-
-static RegisterStandardPasses LocalPass(PassManagerBuilder::EP_LoopOptimizerEnd,
-                                        NoPassRegistration);
-
-typedef void (*TestPassReg)(void (*)(PassManagerBuilder::ExtensionPointTy,
-                                     PassManagerBuilder::ExtensionProc));
-
-TEST(DynamicLibrary, PassRegistration) {
-  std::string Err;
-  llvm_shutdown_obj Shutdown;
-  DynamicLibrary DL =
-      DynamicLibrary::getPermanentLibrary(LibPath().c_str(), &Err);
-  EXPECT_TRUE(DL.isValid());
-  EXPECT_TRUE(Err.empty());
-
-  TestPassReg RP = FuncPtr<TestPassReg>(DL.getAddressOfSymbol("TestPassReg"));
-  RP(&PassManagerBuilder::addGlobalExtension);
-}
-
 static const char *OverloadTestA() { return "OverloadCall"; }
 
 std::string StdString(const char *Ptr) { return Ptr ? Ptr : ""; }

llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx

diff --git a/llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx b/llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx
index 0c2ec00..375d72c 100644
--- a/llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx
+++ b/llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx
@@ -8,10 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "PipSqueak.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
-
-#define PIPSQUEAK_TESTA_RETURN "LibCall"
-#include "ExportedFuncs.cxx"
 
 struct Global {
   std::string *Str;
@@ -49,13 +45,5 @@
   Glb.Vec = &V;
 }
 
-
-static void LibPassRegistration(const llvm::PassManagerBuilder &,
-                                llvm::legacy::PassManagerBase &) {}
-
-extern "C" PIPSQUEAK_EXPORT void TestPassReg(
-    void (*addGlobalExtension)(llvm::PassManagerBuilder::ExtensionPointTy,
-                               llvm::PassManagerBuilder::ExtensionProc)) {
-  addGlobalExtension(llvm::PassManagerBuilder::EP_EarlyAsPossible,
-                     LibPassRegistration);
-}
+#define PIPSQUEAK_TESTA_RETURN "LibCall"
+#include "ExportedFuncs.cxx"