From 43ba2947011f70314347986777c80ad9f2d0a8a2 Mon Sep 17 00:00:00 2001 From: Les De Ridder Date: Wed, 1 Jul 2020 14:23:03 +0200 Subject: [PATCH] Handle demangling API change on LLVM >10.0.0 Partially fixes #2 --- libiberty/msvc-demangle.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libiberty/msvc-demangle.cpp b/libiberty/msvc-demangle.cpp index 37c8436..7b0a806 100644 --- a/libiberty/msvc-demangle.cpp +++ b/libiberty/msvc-demangle.cpp @@ -4,6 +4,7 @@ #include #include +#include #include extern "C" @@ -27,7 +28,11 @@ char* msvc_demangle(const char* sym, int options) flags = llvm::MSDemangleFlags(flags | llvm::MSDF_NoReturnType); } +#if LLVM_VERSION_MAJOR > 10 || LLVM_VERSION_MAJOR == 10 && (LLVM_VERSION_MINOR > 0 || LLVM_VERSION_PATCH > 0) + auto demangled = llvm::microsoftDemangle(mangled, nullptr, nullptr, nullptr, nullptr, flags); +#else auto demangled = llvm::microsoftDemangle(mangled, nullptr, nullptr, nullptr, flags); +#endif if (demangled == nullptr) { return nullptr; }