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
This commit is contained in:
Lang Hames 2016-08-18 01:33:28 +00:00
parent aa4e23e1bb
commit b60f9a25c0
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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<uint64_t>(&x),
RTDyldMemoryManager::getSymbolAddressInProcess("_x"));
#else