Merge pull request #67607 from bnbarham/incremental-opt

bnbarham · web-flow · commit 0f621a0b1652 · 2023-07-31T09:33:41.000-07:00
[ClangImporter] Move incremental processing to the new language option
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -728,6 +728,9 @@ importer::getNormalInvocationArguments(
       }
     }
   }
+
+  invocationArgStrs.push_back("-Xclang");
+  invocationArgStrs.push_back("-fincremental-extensions");
 }
 
 static void
@@ -1346,7 +1349,6 @@ ClangImporter::create(ASTContext &ctx,
     return nullptr; // there was an error related to the compiler arguments.
 
   clang::Preprocessor &clangPP = instance.getPreprocessor();
-  clangPP.enableIncrementalProcessing();
 
   // Setup Preprocessor callbacks before initialing the parser to make sure
   // we catch implicit includes.

Original file line number	Diff line number	Diff line change
`@@ -728,6 +728,9 @@ importer::getNormalInvocationArguments(`
`728`	`728`	`}`
`729`	`729`	`}`
`730`	`730`	`}`
	`731`	`+`
	`732`	`+ invocationArgStrs.push_back("-Xclang");`
	`733`	`+ invocationArgStrs.push_back("-fincremental-extensions");`
`731`	`734`	`}`
`732`	`735`
`733`	`736`	`static void`
`@@ -1346,7 +1349,6 @@ ClangImporter::create(ASTContext &ctx,`
`1346`	`1349`	`return nullptr; // there was an error related to the compiler arguments.`
`1347`	`1350`
`1348`	`1351`	`clang::Preprocessor &clangPP = instance.getPreprocessor();`
`1349`		`- clangPP.enableIncrementalProcessing();`
`1350`	`1352`
`1351`	`1353`	`// Setup Preprocessor callbacks before initialing the parser to make sure`
`1352`	`1354`	`// we catch implicit includes.`