Skip to content

Commit 073bdde

Browse files
bnbarhamAnthonyLatsis
authored andcommitted
Revert "[lldb] Fix the way we set up the lldb modules infrastructure."
This reverts commit f247725, which was a re-application of the original change added back in after "fixing" the underlying issue. See the next commit (also a revert) for more details. (cherry picked from commit 2e97520)
1 parent 5a69e87 commit 073bdde

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,6 @@ ClangModulesDeclVendor::Create(Target &target) {
658658
arch.GetTriple().str(),
659659
"-fmodules-validate-system-headers",
660660
"-Werror=non-modular-include-in-framework-module",
661-
"-Xclang=-fincremental-extensions",
662661
"-Rmodule-build"};
663662

664663
target.GetPlatform()->AddClangModuleCompilationOptions(
@@ -754,6 +753,8 @@ ClangModulesDeclVendor::Create(Target &target) {
754753
instance->getFrontendOpts().Inputs[0]))
755754
return nullptr;
756755

756+
instance->getPreprocessor().enableIncrementalProcessing();
757+
757758
instance->createASTReader();
758759

759760
instance->createSema(action->getTranslationUnitKind(), nullptr);

lldb/test/API/lang/objc/modules-compile-error/TestModulesCompileError.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test(self):
2121
"expr @import LLDBTestModule",
2222
error=True,
2323
substrs=[
24-
"module.h:4:1: error: use of undeclared identifier 'syntax_error_for_lldb_to_find'",
24+
"module.h:4:1: error: unknown type name 'syntax_error_for_lldb_to_find'",
2525
"syntax_error_for_lldb_to_find // comment that tests source printing",
2626
"could not build module 'LLDBTestModule'",
2727
],

0 commit comments

Comments
 (0)