From b60f9a25c0d3e12d3fde9475bdbfb71d6b731cde Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Thu, 18 Aug 2016 01:33:28 +0000 Subject: [PATCH] Revert r279016 -- it breaks win32-elf JIT tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@279029 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp | 4 ++-- unittests/ExecutionEngine/ExecutionEngineTest.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp b/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp index 3fbca3506ebe..e39acc7ee144 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp @@ -265,8 +265,8 @@ RTDyldMemoryManager::getSymbolAddressInProcess(const std::string &Name) { const char *NameStr = Name.c_str(); // DynamicLibrary::SearchForAddresOfSymbol expects an unmangled 'C' symbol - // name so if we're on Darwin or 32-bit Windows, strip the leading '_' off. -#if defined(__APPLE__) || (defined(_WIN32) && !defined(_WIN64)) + // name so ff we're on Darwin, strip the leading '_' off. +#ifdef __APPLE__ if (NameStr[0] == '_') ++NameStr; #endif diff --git a/unittests/ExecutionEngine/ExecutionEngineTest.cpp b/unittests/ExecutionEngine/ExecutionEngineTest.cpp index 798f5ae3575f..7cad84130692 100644 --- a/unittests/ExecutionEngine/ExecutionEngineTest.cpp +++ b/unittests/ExecutionEngine/ExecutionEngineTest.cpp @@ -139,8 +139,8 @@ TEST_F(ExecutionEngineTest, LookupWithMangledAndDemangledSymbol) { // RTDyldMemoryManager::getSymbolAddressInProcess expects a mangled symbol, // but DynamicLibrary is a wrapper for dlsym, which expects the unmangled C // symbol name. This test verifies that getSymbolAddressInProcess strips the - // leading '_' on Darwin and 32-bit Windows, but not on other platforms. -#if defined(__APPLE__) || (defined(_WIN32) && !defined(_WIN64)) + // leading '_' on Darwin, but not on other platforms. +#ifdef __APPLE__ EXPECT_EQ(reinterpret_cast(&x), RTDyldMemoryManager::getSymbolAddressInProcess("_x")); #else