From 1f6fd64fe9c996b4795ee4a6c66b8f9216747560 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 20 Nov 2021 18:39:12 +0100 Subject: Merge llvm-project main llvmorg-14-init-10223-g401b76fdf2b3 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-14-init-10223-g401b76fdf2b3. PR: 261742 MFC after: 2 weeks (cherry picked from commit 5e801ac66d24704442eba426ed13c3effb8a34e7) --- contrib/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp') diff --git a/contrib/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp b/contrib/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp index 64e5090e4c53..6b24d6461b63 100644 --- a/contrib/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp +++ b/contrib/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp @@ -1364,7 +1364,7 @@ Error JITDylib::remove(const SymbolNameSet &Names) { void JITDylib::dump(raw_ostream &OS) { ES.runSessionLocked([&, this]() { - OS << "JITDylib \"" << JITDylibName << "\" (ES: " + OS << "JITDylib \"" << getName() << "\" (ES: " << format("0x%016" PRIx64, reinterpret_cast(&ES)) << "):\n" << "Link order: " << LinkOrder << "\n" << "Symbol table:\n"; @@ -1450,7 +1450,7 @@ JITDylib::MaterializingInfo::takeQueriesMeeting(SymbolState RequiredState) { } JITDylib::JITDylib(ExecutionSession &ES, std::string Name) - : ES(ES), JITDylibName(std::move(Name)) { + : JITLinkDylib(std::move(Name)), ES(ES) { LinkOrder.push_back({this, JITDylibLookupFlags::MatchAllSymbols}); } -- cgit v1.2.3