Skip to content

[lldb][ClangASTImporter][NFC] Emit a log message when we break MapImported invariant #112748

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 6 commits into from
Oct 19, 2024
Merged

[lldb][ClangASTImporter][NFC] Emit a log message when we break MapImported invariant #112748

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
247f263
[lldb][ClangASTImporter][NFC] Emit a log message when we break MapImp…
Michael137 Oct 17, 2024
c1e7815
fixup! add quotes
Michael137 Oct 17, 2024
b239e11
fixup! only do lookup when logging; add braces; WARNING->ERROR
Michael137 Oct 18, 2024
4069dbf
fixup! clang-format
Michael137 Oct 18, 2024
7262cbe
fixup! remove redundant local
Michael137 Oct 18, 2024
3bd2f8c
fixup! clang-format
Michael137 Oct 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
27 changes: 20 additions & 7 deletions lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,25 @@ ClangASTImporter::ASTImporterDelegate::ImportImpl(Decl *From) {

void ClangASTImporter::ASTImporterDelegate::ImportDefinitionTo(
clang::Decl *to, clang::Decl *from) {
Log *log = GetLog(LLDBLog::Expressions);

auto getDeclName = [](Decl const *decl) {
std::string name_string;
if (auto const *from_named_decl = dyn_cast<clang::NamedDecl>(decl)) {
llvm::raw_string_ostream name_stream(name_string);
from_named_decl->printName(name_stream);
}

return name_string;
};

if (auto *D = GetAlreadyImportedOrNull(from); D && D != to)
Copy link
Collaborator

@labath labath Oct 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is expensive (I honestly don't know), you may want to put this in a if(log) block.

LLDB_LOG(log,
"[ClangASTImporter] WARNING: overwriting an already imported decl "
"'{0:x}' ('{1}') from '{2:x}' with '{3:x}'. Likely due to a name "
"conflict when importing '{1}'.",
D, getDeclName(from), from, to);

// We might have a forward declaration from a shared library that we
// gave external lexical storage so that Clang asks us about the full
// definition when it needs it. In this case the ASTImporter isn't aware
Expand All @@ -1145,8 +1164,6 @@ void ClangASTImporter::ASTImporterDelegate::ImportDefinitionTo(
// tell the ASTImporter that 'to' was imported from 'from'.
MapImported(from, to);

Log *log = GetLog(LLDBLog::Expressions);

if (llvm::Error err = ImportDefinition(from)) {
LLDB_LOG_ERROR(log, std::move(err),
"[ClangASTImporter] Error during importing definition: {0}");
Expand All @@ -1158,11 +1175,7 @@ void ClangASTImporter::ASTImporterDelegate::ImportDefinitionTo(
to_tag->setCompleteDefinition(from_tag->isCompleteDefinition());

if (Log *log_ast = GetLog(LLDBLog::AST)) {
std::string name_string;
if (NamedDecl *from_named_decl = dyn_cast<clang::NamedDecl>(from)) {
llvm::raw_string_ostream name_stream(name_string);
from_named_decl->printName(name_stream);
}
std::string name_string = getDeclName(from);
Copy link
Collaborator

@labath labath Oct 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might as well put this call directly into the log message (line 1184)

LLDB_LOG(log_ast,
"==== [ClangASTImporter][TUDecl: {0:x}] Imported "
"({1}Decl*){2:x}, named {3} (from "
Expand Down
Loading