Skip to content

Prepare for kepler #4

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

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Prepare for kepler #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
772a026
fix null ptr, fix warning on virtual method
Jul 4, 2023
cff93dc
fix a bug when getting first char of compilation directory when empty
Apr 18, 2024
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
2 changes: 1 addition & 1 deletion llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class DWARFContext : public DIContext {
DWOUnits.end());
}

virtual StringRef getCompilationDirectory();
StringRef getCompilationDirectory();

/// Get compile units in the DWO context.
compile_unit_range dwo_compile_units() {
Expand Down
6 changes: 5 additions & 1 deletion llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,11 @@ void DWARFContext::dump(
}

StringRef DWARFContext::getCompilationDirectory() {
return StringRef(getCompileUnitForOffset(0)->getCompilationDir());
DWARFCompileUnit * unitForOffset = getCompileUnitForOffset(0);
if (unitForOffset == nullptr) {
return StringRef("");
}
return StringRef(unitForOffset->getCompilationDir());
}

DWARFTypeUnit *DWARFContext::getTypeUnitForHash(uint16_t Version, uint64_t Hash,
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ DILineInfo SymbolizableObjectFile::symbolizeCode(object::SectionedAddress Module
// HACK: Upstream doesn't have the getCompilationDirectory() function.
std::string FullPath = LineInfo.FileName;
std::string Prefix = DebugInfoContext->getCompilationDirectory().str();
if (Prefix.back() != '/') {
if (Prefix.empty() || Prefix.back() != '/') {
Prefix.push_back('/');
}

Expand Down