Revert r227247 and r227228: "Add weak symbol support to RuntimeDyld".

This has wider implications than I expected when I reviewed the patch: It can
cause JIT crashes where clients have used the default value for AbortOnFailure
during symbol lookup. I'm currently investigating alternative approaches and I
hope to have this back in tree soon.

llvm-svn: 227287

4 files changed, 1 insertions, 63 deletions

diff --git a/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt b/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt
index dcf8264203e..b10cbb4c9ea 100644
--- a/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt
+++ b/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(LLVM_LINK_COMPONENTS
   Analysis
-  AsmParser
   Core
   ExecutionEngine
   IPO
diff --git a/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp b/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
index f9ca0fc8717..64d8c2fca04 100644
--- a/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
+++ b/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ExecutionEngine/MCJIT.h"
-#include "llvm/Support/DynamicLibrary.h"
 #include "MCJITTestBase.h"
 #include "gtest/gtest.h"
 
@@ -200,45 +199,4 @@ TEST_F(MCJITTest, multiple_decl_lookups) {
   EXPECT_EQ(A, B) << "Repeat calls to getPointerToFunction fail.";
 }
 
-// Test weak symbol linking when the weak symbol is present in a shared
-// library
-TEST_F(MCJITTest, weak_symbol_present) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  int FakeWeakSymbol;
-  llvm::sys::DynamicLibrary::AddSymbol("FakeWeakSymbol", &FakeWeakSymbol);
-  createJITFromAssembly(
-  "$FakeWeakSymbol = comdat any\n"
-  "@FakeWeakSymbol = linkonce_odr global i32 42, comdat, align 4\n"
-  "define i32 @weak_test(i32* %arg) {\n"
-  "    %r = icmp eq i32* %arg, @FakeWeakSymbol\n"
-  "    %ret = zext i1 %r to i32\n"
-  "    ret i32 %ret\n"
-  "  }");
-
-  uint64_t Addr = TheJIT->getFunctionAddress("weak_test");;
-  EXPECT_TRUE(Addr != 0);
-  int32_t(*FuncPtr)(int32_t *) = (int32_t(*)(int32_t *))Addr;
-  EXPECT_EQ(FuncPtr(&FakeWeakSymbol),1);
-  EXPECT_TRUE(TheJIT->getGlobalValueAddress("FakeWeakSymbol") == 0);
-}
-
-// Test weak symbol linking when the weak symbol is not present in a
-// shared library
-TEST_F(MCJITTest, weak_symbol_absent) {
-  SKIP_UNSUPPORTED_PLATFORM;
-
-  SMDiagnostic Error;
-  createJITFromAssembly(
-  "  $FakeWeakSymbol2 = comdat any\n"
-  "  @FakeWeakSymbol2 = linkonce_odr global i32 42, comdat, align 4\n"
-  "  define i32* @get_weak() {\n"
-  "    ret i32* @FakeWeakSymbol2\n"
-  "  }\n");
-  void*(*FuncPtr)() =
-    (void*(*)(void))TheJIT->getFunctionAddress("get_weak");
-  EXPECT_EQ(FuncPtr(),(void*)TheJIT->getGlobalValueAddress("FakeWeakSymbol2"));
-}
-
-
 }
diff --git a/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h b/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h
index c09c2724881..35af417bf14 100644
--- a/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h
+++ b/llvm/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h
@@ -18,7 +18,6 @@
 #define LLVM_UNITTESTS_EXECUTIONENGINE_MCJIT_MCJITTESTBASE_H
 
 #include "MCJITTestAPICommon.h"
-#include "llvm/AsmParser/Parser.h"
 #include "llvm/Config/config.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/SectionMemoryManager.h"
@@ -28,8 +27,6 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/TypeBuilder.h"
 #include "llvm/Support/CodeGen.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
 
@@ -341,22 +338,6 @@ protected:
     assert(TheJIT.get() != NULL && "error creating MCJIT with EngineBuilder");
   }
 
-  void createJITFromAssembly(const char *Test) {
-    SMDiagnostic Error;
-    M = parseAssemblyString(Test, Error, Context);
-    M->setTargetTriple(Triple::normalize(BuilderTriple));
-
-    std::string errMsg;
-    raw_string_ostream os(errMsg);
-    Error.print("", os);
-
-    // A failure here means that the test itself is buggy.
-    if (!M)
-      report_fatal_error(os.str().c_str());
-
-    createJIT(std::move(M));
-  }
-
   CodeGenOpt::Level OptLevel;
   Reloc::Model RelocModel;
   CodeModel::Model CodeModel;
diff --git a/llvm/unittests/ExecutionEngine/MCJIT/Makefile b/llvm/unittests/ExecutionEngine/MCJIT/Makefile
index 522ef750df7..2822b20cdda 100644
--- a/llvm/unittests/ExecutionEngine/MCJIT/Makefile
+++ b/llvm/unittests/ExecutionEngine/MCJIT/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../../..
 TESTNAME = MCJIT
-LINK_COMPONENTS := core asmparser ipo mcjit native support
+LINK_COMPONENTS := core ipo mcjit native support
 
 include $(LEVEL)/Makefile.config
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest