Skip to content

Use dwarf for symbol lookup if dladdr fails before doing linear search. #58359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Use dwarf for symbol lookup if dladdr fails before doing linear search. #58359

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5423cbf
Use dwarf for symbol lookup if dladdr fails before doing linear search.
gbaraldi May 8, 2025
c93aa58
Fix debug_enabled usage
gbaraldi May 8, 2025
42239e1
Merge branch 'master' into gb/lookupdinfo
gbaraldi May 9, 2025
91e45af
Add null checks
gbaraldi May 9, 2025
c2abfef
Update src/debuginfo.cpp
gbaraldi May 9, 2025
5aa463c
Merge branch 'master' into gb/lookupdinfo
gbaraldi May 14, 2025
5a10bd3
Merge branch 'master' into gb/lookupdinfo
gbaraldi May 15, 2025
866c5f4
Disable new codepath for testing
gbaraldi May 19, 2025
bb745a1
Fix warning
gbaraldi May 19, 2025
d6eaf60
Merge branch 'master' into gb/lookupdinfo
gbaraldi Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 44 additions & 15 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6734,7 +6734,7 @@ static std::string get_function_name(bool specsig, bool needsparams, const char
}

static void gen_invoke_wrapper(jl_method_instance_t *lam, jl_value_t *abi, jl_value_t *jlretty, jl_value_t *declrt, jl_returninfo_t &f, unsigned nargs, int retarg, bool is_opaque_closure, StringRef funcName,
Module *M, jl_codegen_params_t &params);
Module *M, jl_codegen_params_t &params, DILocation* DbgLoc = NULL);

Function *get_or_emit_fptr1(StringRef preal_decl, Module *M)
{
Expand Down Expand Up @@ -7781,7 +7781,7 @@ const char *jl_generate_ccallable(Module *llvmmod, jl_value_t *nameval, jl_value
// generate a julia-callable function that calls f (AKA lam)
// if is_opaque_closure, then generate the OC invoke, rather than a real invoke
static void gen_invoke_wrapper(jl_method_instance_t *lam, jl_value_t *abi, jl_value_t *jlretty, jl_value_t *declrt, jl_returninfo_t &f, unsigned nargs, int retarg, bool is_opaque_closure, StringRef funcName,
Module *M, jl_codegen_params_t &params)
Module *M, jl_codegen_params_t &params, DILocation *DbgLoc)
{
++GeneratedInvokeWrappers;
Function *w = Function::Create(get_func_sig(M->getContext()), GlobalVariable::ExternalLinkage, funcName, M);
Expand All @@ -7805,7 +7805,15 @@ static void gen_invoke_wrapper(jl_method_instance_t *lam, jl_value_t *abi, jl_va
BasicBlock *b0 = BasicBlock::Create(ctx.builder.getContext(), "top", w);
ctx.builder.SetInsertPoint(b0);
DebugLoc noDbg;
ctx.builder.SetCurrentDebugLocation(noDbg);
if (DbgLoc) {
if (auto scope = DbgLoc->getScope())
if (auto SP = scope->getSubprogram())
w->setSubprogram(SP);
ctx.builder.SetCurrentDebugLocation(DbgLoc);
}
else {
ctx.builder.SetCurrentDebugLocation(noDbg);
}
allocate_gc_frame(ctx, b0);

SmallVector<jl_cgval_t, 0> argv(nargs);
Expand Down Expand Up @@ -8289,6 +8297,19 @@ static jl_llvm_functions_t
Module *M = TSM.getModuleUnlocked();
jl_debugcache_t debugcache;
debugcache.initialize(M);
DICompileUnit::DebugEmissionKind emissionKind = (DICompileUnit::DebugEmissionKind) ctx.params->debug_info_kind;
DICompileUnit::DebugNameTableKind tableKind;
if (JL_FEAT_TEST(ctx, gnu_pubnames))
tableKind = DICompileUnit::DebugNameTableKind::GNU;
else
tableKind = DICompileUnit::DebugNameTableKind::None;
DIBuilder dbuilder(*M, true, debug_enabled ? getOrCreateJuliaCU(*M, emissionKind, tableKind) : NULL);
DIFile *topfile = NULL;
DISubprogram *SP = NULL;
DebugLoc noDbg, topdebugloc;
if (debug_enabled) {
topfile = dbuilder.createFile(ctx.file, ".");
}
jl_returninfo_t returninfo = {};
Function *f = NULL;
bool has_sret = false;
Expand Down Expand Up @@ -8342,7 +8363,25 @@ static jl_llvm_functions_t
raw_string_ostream(wrapName) << "jfptr_" << ctx.name << "_" << jl_atomic_fetch_add_relaxed(&globalUniqueGeneratedNames, 1);
declarations.functionObject = wrapName;
size_t nparams = jl_nparams(abi);
gen_invoke_wrapper(lam, abi, jlrettype, jlrettype, returninfo, nparams, retarg, ctx.is_opaque_closure, declarations.functionObject, M, ctx.emission_context);
DILocation *wrapperloc = NULL;
// set the debug info for the wrapper function
if (debug_enabled) {
DISubprogram *SP2 = dbuilder.createFunction(nullptr
, wrapName // Name
, dbgFuncName // LinkageName
,topfile // File
,toplineno // LineNo
,debugcache.jl_di_func_null_sig // Ty
,toplineno // ScopeLine
,DINode::FlagZero // Flags
,DISubprogram::SPFlagDefinition | DISubprogram::SPFlagOptimized // SPFlags
,nullptr // Template Parameters
,nullptr // Template Declaration
,nullptr // ThrownTypes
);
wrapperloc = DILocation::get(ctx.builder.getContext(), toplineno, 0, SP2, NULL);
}
gen_invoke_wrapper(lam, abi, jlrettype, jlrettype, returninfo, nparams, retarg, ctx.is_opaque_closure, declarations.functionObject, M, ctx.emission_context, wrapperloc);
// TODO: add attributes: maybe_mark_argument_dereferenceable(Arg, argType)
// TODO: add attributes: dereferenceable<sizeof(void*) * nreq>
// TODO: (if needsparams) add attributes: dereferenceable<sizeof(void*) * length(sp)>, readonly, nocapture
Expand Down Expand Up @@ -8403,18 +8442,8 @@ static jl_llvm_functions_t
ctx.f = f;

// Step 4b. determine debug info signature and other type info for locals
DICompileUnit::DebugEmissionKind emissionKind = (DICompileUnit::DebugEmissionKind) ctx.params->debug_info_kind;
DICompileUnit::DebugNameTableKind tableKind;
if (JL_FEAT_TEST(ctx, gnu_pubnames))
tableKind = DICompileUnit::DebugNameTableKind::GNU;
else
tableKind = DICompileUnit::DebugNameTableKind::None;
DIBuilder dbuilder(*M, true, debug_enabled ? getOrCreateJuliaCU(*M, emissionKind, tableKind) : NULL);
DIFile *topfile = NULL;
DISubprogram *SP = NULL;
DebugLoc noDbg, topdebugloc;

if (debug_enabled) {
topfile = dbuilder.createFile(ctx.file, ".");
DISubroutineType *subrty;
if (ctx.emission_context.params->debug_info_level <= 1)
subrty = debugcache.jl_di_func_null_sig;
Expand Down
31 changes: 30 additions & 1 deletion src/debuginfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include "llvm-version.h"
#include <llvm/DebugInfo/DIContext.h>
#include <llvm/DebugInfo/DWARF/DWARFContext.h>
#include <llvm/DebugInfo/DWARF/DWARFUnit.h>
#include <llvm/DebugInfo/DWARF/DWARFCompileUnit.h>
#include <llvm/Object/SymbolSize.h>
#include <llvm/Support/MemoryBuffer.h>
#include <llvm/Support/MemoryBufferRef.h>
Expand Down Expand Up @@ -497,7 +499,10 @@ static int lookup_pointer(

jl_frame_t *frame = &(*frames)[i];
std::string func_name(info.FunctionName);

if (func_name.find("jfptr_") != std::string::npos) {
// This is a jlcall wrapper, so we don't want to show it in the backtrace
frame->fromC = 1;
}
if (inlined_frame) {
frame->inlined = 1;
frame->fromC = fromC;
Expand Down Expand Up @@ -1131,6 +1136,30 @@ bool jl_dylib_DI_for_fptr(size_t pointer, object::SectionRef *Section, int64_t *
*context = entry.ctx;
if (entry.obj)
*Section = getModuleSectionForAddress(entry.obj, pointer + entry.slide);
if ((saddr && !*saddr) || (name && !*name)) {
if (auto DWctx = dyn_cast_or_null<llvm::DWARFContext>(*context)){
uintptr_t saddrdwarf = 0;
char *snamedwarf = nullptr;
auto CU = DWctx->getCompileUnitForCodeAddress(pointer + entry.slide); // XXX: Merge this with the dwarf lookup in lookup_pointer
if (CU) {
auto DIE = CU->getSubroutineForAddress(pointer +entry.slide);
while (DIE && !DIE.isSubprogramDIE()) {
DIE = DIE.getParent();
}
if (DIE) {
snamedwarf = (char*)DIE.getSubroutineName(DILineInfoSpecifier::FunctionNameKind::LinkageName);
auto Ranges = DIE.getAddressRanges();
if (Ranges) {
saddrdwarf = (*Ranges->begin()).LowPC;
saddrdwarf -= entry.slide;
*saddr = (void*)saddrdwarf;
}
*name = strdup(snamedwarf);
untrusted_dladdr = false;
}
}
}
}
// Assume we only need base address for sysimg for now
if (!inimage || 0 == image_info.fptrs.nptrs)
saddr = nullptr;
Expand Down