This is an archive of the discontinued LLVM Phabricator instance.

Differential D138750

[lldb][JITLoaderGDB] Resolve __jit_debug_register_code as eSymbolTypeCode
ClosedPublic

Authored by sgraenitz on Nov 26 2022, 3:51 PM.

Details

Reviewers
mgorny
labath
Commits
rGc1a419c6cf6d: [lldb][JITLoaderGDB] Resolve __jit_debug_register_code as eSymbolTypeCode
Summary

Fix failling jit-loader tests in SHARED_LIBS build as discussed in https://github.com/llvm/llvm-project/issues/56085

Diff Detail

Event Timeline

sgraenitz created this revision.Nov 26 2022, 3:51 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 26 2022, 3:51 PM
sgraenitz requested review of this revision.Nov 26 2022, 3:51 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 26 2022, 3:51 PM
Harbormaster completed remote builds in B199634: Diff 478072.Nov 26 2022, 3:55 PM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptNov 26 2022, 3:55 PM
mgorny accepted this revision.Nov 26 2022, 9:58 PM

Thanks. I can confirm that the two tests pass for me with this patch.

This revision is now accepted and ready to land.Nov 26 2022, 9:58 PM
Closed by commit rGc1a419c6cf6d: [lldb][JITLoaderGDB] Resolve __jit_debug_register_code as eSymbolTypeCode (authored by sgraenitz). · Explain WhyNov 27 2022, 2:46 AM
This revision was automatically updated to reflect the committed changes.
sgraenitz added a commit: rGc1a419c6cf6d: [lldb][JITLoaderGDB] Resolve __jit_debug_register_code as eSymbolTypeCode.

Revision Contents

PathSize
lldb/
source/
Plugins/
JITLoader/
GDB/
2 lines
test/
Shell/
Breakpoint/
2 lines
2 lines

Diff 478072

lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp

Show First 20 Lines • Show All 184 Lines • ▼ Show 20 Linesvoid JITLoaderGDB::SetJITBreakpoint(lldb_private::ModuleList &module_list) {
if (DidSetJITBreakpoint()) if (DidSetJITBreakpoint())
return; return;
Log *log = GetLog(LLDBLog::JITLoader); Log *log = GetLog(LLDBLog::JITLoader);
LLDB_LOGF(log, "JITLoaderGDB::%s looking for JIT register hook", LLDB_LOGF(log, "JITLoaderGDB::%s looking for JIT register hook",
__FUNCTION__); __FUNCTION__);
addr_t jit_addr = GetSymbolAddress( addr_t jit_addr = GetSymbolAddress(
module_list, ConstString("__jit_debug_register_code"), eSymbolTypeAny); module_list, ConstString("__jit_debug_register_code"), eSymbolTypeCode);
if (jit_addr == LLDB_INVALID_ADDRESS) if (jit_addr == LLDB_INVALID_ADDRESS)
return; return;
m_jit_descriptor_addr = GetSymbolAddress( m_jit_descriptor_addr = GetSymbolAddress(
module_list, ConstString("__jit_debug_descriptor"), eSymbolTypeData); module_list, ConstString("__jit_debug_descriptor"), eSymbolTypeData);
if (m_jit_descriptor_addr == LLDB_INVALID_ADDRESS) { if (m_jit_descriptor_addr == LLDB_INVALID_ADDRESS) {
LLDB_LOGF(log, "JITLoaderGDB::%s failed to find JIT descriptor address", LLDB_LOGF(log, "JITLoaderGDB::%s failed to find JIT descriptor address",
__FUNCTION__); __FUNCTION__);
▲ Show 20 Lines • Show All 261 Lines • Show Last 20 Lines

lldb/test/Shell/Breakpoint/jit-loader_jitlink_elf.test

# REQUIRES: target-x86_64 # REQUIRES: target-x86_64
# https://github.com/llvm/llvm-project/issues/56085
# XFAIL: system-freebsd
# XFAIL: system-windows # XFAIL: system-windows
# JITLink is the Orc-specific JIT linker implementation. # JITLink is the Orc-specific JIT linker implementation.
# #
# RUN: %clang -g -S -emit-llvm -fPIC --target=x86_64-unknown-unknown-elf \ # RUN: %clang -g -S -emit-llvm -fPIC --target=x86_64-unknown-unknown-elf \
# RUN: -o %t.ll %p/Inputs/jitbp.cpp # RUN: -o %t.ll %p/Inputs/jitbp.cpp
# RUN: %lldb -b -o 'settings set plugin.jit-loader.gdb.enable on' -o 'b jitbp' \ # RUN: %lldb -b -o 'settings set plugin.jit-loader.gdb.enable on' -o 'b jitbp' \
# RUN: -o 'run --jit-linker=jitlink %t.ll' lli | FileCheck %s # RUN: -o 'run --jit-linker=jitlink %t.ll' lli | FileCheck %s
Show All 9 Lines

lldb/test/Shell/Breakpoint/jit-loader_rtdyld_elf.test

# REQUIRES: target-x86_64 # REQUIRES: target-x86_64
# https://github.com/llvm/llvm-project/issues/56085
# XFAIL: system-freebsd
# XFAIL: system-windows # XFAIL: system-windows
# RuntimeDyld can be used to link and load emitted code for both, MCJIT and Orc. # RuntimeDyld can be used to link and load emitted code for both, MCJIT and Orc.
# #
# RUN: %clang -g -S -emit-llvm --target=x86_64-unknown-unknown-elf \ # RUN: %clang -g -S -emit-llvm --target=x86_64-unknown-unknown-elf \
# RUN: -o %t.ll %p/Inputs/jitbp.cpp # RUN: -o %t.ll %p/Inputs/jitbp.cpp
# #
# RUN: %lldb -b -o 'settings set plugin.jit-loader.gdb.enable on' -o 'b jitbp' \ # RUN: %lldb -b -o 'settings set plugin.jit-loader.gdb.enable on' -o 'b jitbp' \
Show All 13 Lines