Fix clang-tools-extra tests

Author: jansvoboda11

clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp

@@ -90,14 +90,14 @@ ExpandModularHeadersPPCallbacks::ExpandModularHeadersPPCallbacks(
                                               &Compiler.getTarget());
 
   PP = std::make_unique<clang::Preprocessor>(Compiler.getPreprocessorOpts(),
-                                             Diags, LangOpts, Sources,
+                                             Diags, LangOpts, CGOpts, Sources,
                                              *HeaderInfo, ModuleLoader,
                                              /*IILookup=*/nullptr,
                                              /*OwnsHeaderSearch=*/false);
   PP->Initialize(Compiler.getTarget(), Compiler.getAuxTarget());
   InitializePreprocessor(*PP, Compiler.getPreprocessorOpts(),
                          Compiler.getPCHContainerReader(),
-                         Compiler.getFrontendOpts(), Compiler.getCodeGenOpts());
+                         Compiler.getFrontendOpts());
   ApplyHeaderSearchOptions(*HeaderInfo, HSOpts, LangOpts,
                            Compiler.getTarget().getTriple());
 }

clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h

@@ -131,6 +131,7 @@ class ExpandModularHeadersPPCallbacks : public PPCallbacks {
   DiagnosticOptions DiagOpts;
   DiagnosticsEngine Diags;
   LangOptions LangOpts;
+  CodeGenOptions CGOpts;
   HeaderSearchOptions HSOpts;
   TrivialModuleLoader ModuleLoader;
 

clang-tools-extra/clangd/ModulesBuilder.cpp

@@ -194,6 +194,7 @@ bool IsModuleFileUpToDate(PathRef ModuleFilePath,
 
   LangOptions LangOpts;
   LangOpts.SkipODRCheckInGMF = true;
+  CodeGenOptions CGOpts;
 
   FileManager FileMgr(FileSystemOptions(), VFS);
 
@@ -204,7 +205,7 @@ bool IsModuleFileUpToDate(PathRef ModuleFilePath,
 
   PreprocessorOptions PPOpts;
   TrivialModuleLoader ModuleLoader;
-  Preprocessor PP(PPOpts, *Diags, LangOpts, SourceMgr, HeaderInfo,
+  Preprocessor PP(PPOpts, *Diags, LangOpts, CGOpts, SourceMgr, HeaderInfo,
                   ModuleLoader);
 
   IntrusiveRefCntPtr<ModuleCache> ModCache = createCrossProcessModuleCache();