Skip to content

[lldb][Modules] Make decls from submodules visible for name lookup #143098

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 3 commits into from
Jun 6, 2025
Merged

[lldb][Modules] Make decls from submodules visible for name lookup #143098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
902a656
[lldb][Modules] Make decls from submodules visible for name lookup
Michael137 Jun 6, 2025
b22de21
fixup! XFAIL on Linux
Michael137 Jun 6, 2025
98969e7
fixup! fix test
Michael137 Jun 6, 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
7 changes: 7 additions & 0 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 @@ -382,6 +382,13 @@ bool ClangModulesDeclVendorImpl::AddModule(const SourceModule &module,
}
}

// If we didn't make the submodule visible here, Clang wouldn't allow LLDB to
// pick any of the decls in the submodules during C++ name lookup.
if (submodule)
m_compiler_instance->makeModuleVisible(
submodule, clang::Module::NameVisibilityKind::AllVisible,
/*ImportLoc=*/{});

clang::Module *requested_module = DoGetModule(clang_path, true);

if (requested_module != nullptr) {
Expand Down
14 changes: 4 additions & 10 deletions lldb/test/API/lang/cpp/decl-from-submodule/TestDeclFromSubmodule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,11 @@
class DeclFromSubmoduleTestCase(TestBase):
# Requires DWARF debug info which is not retained when linking with link.exe.
@skipIfWindows
# Lookup for decls in submodules fails in Linux
@expectedFailureAll(oslist=["linux"])
Copy link
Collaborator

@adrian-prantl adrian-prantl Jun 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Is it really Linux or local submodule visibility?

Copy link
Member Author

Choose a reason for hiding this comment

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

Probably local submodule visibility. Just didn't have the time to investigate this on Linux

def test_expr(self):
self.build()
lldbutil.run_to_source_breakpoint(self, "return 0", lldb.SBFileSpec("main.cpp"))

# FIXME: LLDB finds the decl for 'func' in the submodules correctly and hands it to Clang
# but Sema rejects using the decl during name lookup because it is not marked "Visible".
# However, this assertions still ensures that we at least don't fail to compile the
# submodule (which would cause other errors to appear before the expression error, hence
# we use "startstr").
self.expect(
"expr func(1, 2)",
error=True,
startstr="error: <user expression 0>:1:1: 'func' has unknown return type",
)
self.expect_expr("func(1, 2)", result_type="int", result_value="3")
self.expect_expr("func(1)", result_type="int", result_value="1")
Loading