Skip to content

Commit ba0183e

Browse files
Fix demangle
1 parent d74ba77 commit ba0183e

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

lib/Interpreter/CppInterOp.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3436,15 +3436,23 @@ namespace Cpp {
34363436
static inline std::string DemangleNameForDlsym(const std::string& name) {
34373437
std::string nameForDlsym = name;
34383438

3439-
#if defined(R__MACOSX) || defined(R__WIN32)
3439+
static bool is_demangle_active = false;
3440+
static bool demangle = false;
3441+
if (!is_demangle_active) {
3442+
auto& I = getInterp();
3443+
llvm::orc::LLJIT& EE = *compat::getExecutionEngine(I);
3444+
auto t = EE.getTargetMachine().getTargetTriple();
3445+
demangle = t.isOSDarwin() || t.isWindows();
3446+
is_demangle_active = true;
3447+
}
3448+
34403449
// The JIT gives us a mangled name which has an additional leading underscore
34413450
// on macOS and Windows, for instance __ZN8TRandom34RndmEv. However, dlsym
34423451
// requires us to remove it.
34433452
// FIXME: get this information from the DataLayout via getGlobalPrefix()!
3444-
if (nameForDlsym[0] == '_')
3453+
if (demangle && nameForDlsym[0] == '_')
34453454
nameForDlsym.erase(0, 1);
3446-
#endif //R__MACOSX
3447-
3455+
}
34483456
return nameForDlsym;
34493457
}
34503458

0 commit comments

Comments
 (0)