diff options
| -rw-r--r-- | llvm/lib/DebugInfo/Symbolize/Symbolize.cpp | 36 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-symbolizer/coff-dwarf.test | 3 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-symbolizer/coff-exports.test | 3 |
3 files changed, 11 insertions, 31 deletions
diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp index 7138f66271b..be79d9e637c 100644 --- a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp +++ b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp @@ -35,19 +35,6 @@ #include <cassert> #include <cstring> -#if defined(_MSC_VER) -#include <Windows.h> - -// This must be included after windows.h. -#include <DbgHelp.h> -#pragma comment(lib, "dbghelp.lib") - -// Windows.h conflicts with our COFF header definitions. -#ifdef IMAGE_FILE_MACHINE_I386 -#undef IMAGE_FILE_MACHINE_I386 -#endif -#endif - namespace llvm { namespace symbolize { @@ -534,21 +521,20 @@ LLVMSymbolizer::DemangleName(const std::string &Name, return Result; } -#if defined(_MSC_VER) if (!Name.empty() && Name.front() == '?') { // Only do MSVC C++ demangling on symbols starting with '?'. - char DemangledName[1024] = {0}; - DWORD result = ::UnDecorateSymbolName( - Name.c_str(), DemangledName, 1023, - UNDNAME_NO_ACCESS_SPECIFIERS | // Strip public, private, protected - UNDNAME_NO_ALLOCATION_LANGUAGE | // Strip __thiscall, __stdcall, etc - UNDNAME_NO_THROW_SIGNATURES | // Strip throw() specifications - UNDNAME_NO_MEMBER_TYPE | // Strip virtual, static, etc specifiers - UNDNAME_NO_MS_KEYWORDS | // Strip all MS extension keywords - UNDNAME_NO_FUNCTION_RETURNS); // Strip function return types - return (result == 0) ? Name : std::string(DemangledName); + int status = 0; + char *DemangledName = microsoftDemangle( + Name.c_str(), nullptr, nullptr, &status, + MSDemangleFlags(MSDF_NoAccessSpecifier | MSDF_NoCallingConvention | + MSDF_NoMemberType | MSDF_NoReturnType)); + if (status != 0) + return Name; + std::string Result = DemangledName; + free(DemangledName); + return Result; } -#endif + if (DbiModuleDescriptor && DbiModuleDescriptor->isWin32Module()) return std::string(demanglePE32ExternCFunc(Name)); return Name; diff --git a/llvm/test/tools/llvm-symbolizer/coff-dwarf.test b/llvm/test/tools/llvm-symbolizer/coff-dwarf.test index 03b5d9147fe..21d06b197ee 100644 --- a/llvm/test/tools/llvm-symbolizer/coff-dwarf.test +++ b/llvm/test/tools/llvm-symbolizer/coff-dwarf.test @@ -5,9 +5,6 @@ RUN: | FileCheck %s RUN: llvm-symbolizer 0x5009 0x5038 -i --relative-address -obj="%p/Inputs/coff-dwarf.exe" \ RUN: | FileCheck %s -This test relies on UnDecorateSymbolName, which is Windows-only. -REQUIRES: system-windows - CHECK: foo(void) CHECK: coff-dwarf.cpp:7 CHECK: bar(void) diff --git a/llvm/test/tools/llvm-symbolizer/coff-exports.test b/llvm/test/tools/llvm-symbolizer/coff-exports.test index 255681178f4..a5d972f6e49 100644 --- a/llvm/test/tools/llvm-symbolizer/coff-exports.test +++ b/llvm/test/tools/llvm-symbolizer/coff-exports.test @@ -5,9 +5,6 @@ RUN: | FileCheck %s RUN: llvm-symbolizer 0x500A 0x5038 0x504B -i --relative-address -obj="%p/Inputs/coff-exports.exe" \ RUN: | FileCheck %s -This test relies on UnDecorateSymbolName, which is Win32-only. -REQUIRES: system-windows - We get the expected stack trace, except 'foo' appears for the 'bar' frame because 'bar' isn't in the export table. |
