Skip to content

Improve logging. #8186

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 4 commits into from
Feb 14, 2024
Merged

Improve logging. #8186

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfbd76b
Improve logging.
adrian-prantl Feb 13, 2024
cdbce45
Use early-exit short-circuit evaluation (NFC)
adrian-prantl Feb 14, 2024
895f7da
Add error logging when reflection metadata loadign fails
adrian-prantl Feb 14, 2024
438950f
Log GetObjectName or the Object filename, whichever is available.
adrian-prantl Feb 14, 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
35 changes: 21 additions & 14 deletions lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,13 +475,10 @@ static bool HasReflectionInfo(ObjectFile *obj_file) {
StringRef reflstr =
obj_file_format_up->getSectionName(swift::ReflectionSectionKind::reflstr);

bool hasReflectionSection = false;
hasReflectionSection |= findSectionInObject(field_md);
hasReflectionSection |= findSectionInObject(assocty);
hasReflectionSection |= findSectionInObject(builtin);
hasReflectionSection |= findSectionInObject(capture);
hasReflectionSection |= findSectionInObject(typeref);
hasReflectionSection |= findSectionInObject(reflstr);
bool hasReflectionSection =
findSectionInObject(field_md) || findSectionInObject(assocty) ||
findSectionInObject(builtin) || findSectionInObject(capture) ||
findSectionInObject(typeref) || findSectionInObject(reflstr);
return hasReflectionSection;
}

Expand Down Expand Up @@ -887,14 +884,18 @@ bool SwiftLanguageRuntimeImpl::AddModuleToReflectionContext(

if (load_ptr == 0 || load_ptr == LLDB_INVALID_ADDRESS) {
if (obj_file->GetType() != ObjectFile::eTypeJIT)
if (Log *log = GetLog(LLDBLog::Types))
log->Printf("%s: failed to get start address for %s.", __FUNCTION__,
obj_file->GetFileSpec().GetFilename().GetCString());
LLDB_LOG(GetLog(LLDBLog::Types),
"{0}: failed to get start address for \"{1}\".", __FUNCTION__,
module_sp->GetObjectName()
? module_sp->GetObjectName()
: obj_file->GetFileSpec().GetFilename());
return false;
}
bool found = HasReflectionInfo(obj_file);
LLDB_LOGF(GetLog(LLDBLog::Types), "%s reflection metadata in \"%s\"",
found ? "Adding" : "No", obj_file->GetFileSpec().GetPath().c_str());
LLDB_LOG(GetLog(LLDBLog::Types), "{0} reflection metadata in \"{1}\"",
found ? "Adding" : "No",
module_sp->GetObjectName() ? module_sp->GetObjectName()
: obj_file->GetFileSpec().GetFilename());
if (!found)
return true;

Expand Down Expand Up @@ -924,8 +925,14 @@ bool SwiftLanguageRuntimeImpl::AddModuleToReflectionContext(
likely_module_names);
}

if (info_id)
if (auto *swift_metadata_cache = GetSwiftMetadataCache())
if (!info_id) {
LLDB_LOG(GetLog(LLDBLog::Types),
"Error while loading reflection metadata in \"{0}\"",
module_sp->GetObjectName());
return false;
}

if (auto *swift_metadata_cache = GetSwiftMetadataCache())
swift_metadata_cache->registerModuleWithReflectionInfoID(module_sp,
*info_id);

Expand Down