Skip to content

[lldb][ClangModulesDeclVendor] Don't stop loading Clang modules if an individual import failed #166940

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
Nov 7, 2025
Merged

[lldb][ClangModulesDeclVendor] Don't stop loading Clang modules if an individual import failed #166940

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
89c1cd5
[lldb][ClangModulesDeclVendor] Don't stop loading Clang modules if an…
Michael137 Nov 7, 2025
39856ea
fixup! add newline now that we're printing more than a single error
Michael137 Nov 7, 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
2 changes: 1 addition & 1 deletion lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ bool ClangExpressionSourceCode::GetText(
*sc.comp_unit, modules_for_macros))
LLDB_LOG_ERROR(
GetLog(LLDBLog::Expressions), std::move(err),
"Error while loading hand-imported modules: {0}");
"Error while loading hand-imported modules:\n{0}");
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,13 +436,13 @@ llvm::Error ClangModulesDeclVendorImpl::AddModulesForCompileUnit(
if (!LanguageSupportsClangModules(cu.GetLanguage()))
return llvm::Error::success();

llvm::Error errors = llvm::Error::success();

for (auto &imported_module : cu.GetImportedModules())
// TODO: don't short-circuit. Continue loading modules even if one of them
// fails. Concatenate all the errors.
if (auto err = AddModule(imported_module, &exported_modules))
return err;
errors = llvm::joinErrors(std::move(errors), std::move(err));

return llvm::Error::success();
return errors;
}

// ClangImporter::lookupValue
Expand Down
6 changes: 4 additions & 2 deletions lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,10 @@ static void SetupDeclVendor(ExecutionContext &exe_ctx, Target *target,

// FIXME: should we be dumping these to the error log instead of as
// diagnostics? They are non-fatal and are usually quite noisy.
diagnostic_manager.PutString(lldb::eSeverityInfo,
llvm::toString(std::move(err)));
llvm::handleAllErrors(
std::move(err), [&diagnostic_manager](const llvm::StringError &e) {
diagnostic_manager.PutString(lldb::eSeverityInfo, e.getMessage());
});
}

ClangExpressionSourceCode::WrapKind ClangUserExpression::GetWrapKind() const {
Expand Down
3 changes: 1 addition & 2 deletions lldb/test/Shell/Expr/TestClangModuleLoadError_InvalidSearchPath.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ run
expr blah

# CHECK: note: couldn't find module search path directory {{.*}}sources
## FIXME: We never attempted to load bar.
# CHECK-NOT: couldn't find module search path
# CHECK: note: couldn't find module search path directory {{.*}}sources
5 changes: 3 additions & 2 deletions lldb/test/Shell/Expr/TestClangModuleLoadError_InvalidTopLevelModule.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ expr blah
# CHECK: note: couldn't load top-level module foo
## FIXME: clang error diagnostic shouldn't be dumped to the console.
# CHECK: error:
## FIXME: We never attempted to load bar.
# CHECK-NOT: bar
# CHECK: note: couldn't load top-level module bar
## FIXME: clang error diagnostic shouldn't be dumped to the console.
# CHECK: error:
3 changes: 1 addition & 2 deletions lldb/test/Shell/Expr/TestClangModuleLoadError_ModulemapParsing.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,4 @@ run
expr blah

# CHECK: note: failed to parse and load modulemap file in {{.*}}sources
## FIXME: We never attempted to load bar.
# CHECK-NOT: failed to parse and load modulemap
# CHECK: note: failed to parse and load modulemap file in {{.*}}sources
3 changes: 1 addition & 2 deletions lldb/test/Shell/Expr/TestClangModuleLoadError_NoModule.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ run
expr blah

# CHECK: note: header search couldn't locate module 'foo'
## FIXME: We never attempted to load bar.
# CHECK-NOT: bar
# CHECK: note: header search couldn't locate module 'bar'
3 changes: 1 addition & 2 deletions lldb/test/Shell/Expr/TestClangModuleLoadError_NoModuleMap.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@ run
expr blah

# CHECK: note: couldn't find modulemap file in {{.*}}sources
## FIXME: We never attempted to load bar.
# CHECK-NOT: couldn't find modulemap
# CHECK: note: couldn't find modulemap file in {{.*}}sources
Loading