Skip to content

Commit 7ef7ea4

Browse files
authored
Fix asan on llvm 20
We should try and get this fixed upstream
1 parent 33b66bc commit 7ef7ea4

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

src/jitlayers.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,17 +1986,14 @@ JuliaOJIT::JuliaOJIT()
19861986
reinterpret_cast<void *>(static_cast<uintptr_t>(msan_workaround::MSanTLS::origin))), JITSymbolFlags::Exported};
19871987
cantFail(GlobalJD.define(orc::absoluteSymbols(msan_crt)));
19881988
#endif
1989-
#if JL_LLVM_VERSION < 200000
19901989
#ifdef _COMPILER_ASAN_ENABLED_
19911990
// this is a hack to work around a bad assertion:
19921991
// /workspace/srcdir/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp:3028: llvm::Error llvm::orc::ExecutionSession::OL_notifyResolved(llvm::orc::MaterializationResponsibility&, const SymbolMap&): Assertion `(KV.second.getFlags() & ~JITSymbolFlags::Common) == (I->second & ~JITSymbolFlags::Common) && "Resolving symbol with incorrect flags"' failed.
1993-
// hopefully fixed upstream by e7698a13e319a9919af04d3d693a6f6ea7168a44
19941992
static int64_t jl___asan_globals_registered;
19951993
orc::SymbolMap asan_crt;
19961994
asan_crt[mangle("___asan_globals_registered")] = {ExecutorAddr::fromPtr(&jl___asan_globals_registered), JITSymbolFlags::Common | JITSymbolFlags::Exported};
19971995
cantFail(JD.define(orc::absoluteSymbols(asan_crt)));
19981996
#endif
1999-
#endif
20001997
}
20011998

20021999
JuliaOJIT::~JuliaOJIT() = default;

0 commit comments

Comments
 (0)