Skip to content

Commit

Permalink
[lldb] Fix the way we set up the lldb modules infrastructure.
Browse files Browse the repository at this point in the history
D127284 introduced a new language option which is not benign from modules
perspective. Before this patch lldb would set up the compiler invocation and
later enable incremental processing. Post-D127284 this does not work because
the option causes a module hash mismatch for implicit modules.

In addition, D127284 enables parsing statements on the global scope if
incremental processing is on and thus `syntax_error_for_lldb_to_find` was
rightfully not recognized as a declaration and is considered a statement
which produces a slightly different diagnostic.

Thanks to Michael Buch for the help in understanding this issue. This patch
should appease the lldb bots.

More discussion available at: https://reviews.llvm.org/D127284
  • Loading branch information
vgvassilev committed Dec 5, 2022
1 parent 92c96f2 commit c95a0c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
Expand Up @@ -609,7 +609,8 @@ ClangModulesDeclVendor::Create(Target &target) {
"-target",
arch.GetTriple().str(),
"-fmodules-validate-system-headers",
"-Werror=non-modular-include-in-framework-module"};
"-Werror=non-modular-include-in-framework-module",
"-Xclang=-fincremental-extensions"};

target.GetPlatform()->AddClangModuleCompilationOptions(
&target, compiler_invocation_arguments);
Expand Down Expand Up @@ -701,8 +702,6 @@ ClangModulesDeclVendor::Create(Target &target) {
instance->getFrontendOpts().Inputs[0]))
return nullptr;

instance->getPreprocessor().enableIncrementalProcessing();

instance->createASTReader();

instance->createSema(action->getTranslationUnitKind(), nullptr);
Expand Down
Expand Up @@ -16,6 +16,6 @@ def test(self):
# Check that the error message shows file/line/column, prints the relevant
# line from the source code and mentions the module that failed to build.
self.expect("expr @import LLDBTestModule", error=True,
substrs=["module.h:4:1: error: unknown type name 'syntax_error_for_lldb_to_find'",
substrs=["module.h:4:1: error: undeclared identifier 'syntax_error_for_lldb_to_find'",
"syntax_error_for_lldb_to_find // comment that tests source printing",
"could not build module 'LLDBTestModule'"])

0 comments on commit c95a0c9

Please sign in to comment.