Skip to content

Commit 740fd6f

Browse files
committed
Fix clang-tools-extra tests
1 parent 3dfa76e commit 740fd6f

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ ExpandModularHeadersPPCallbacks::ExpandModularHeadersPPCallbacks(
9090
&Compiler.getTarget());
9191

9292
PP = std::make_unique<clang::Preprocessor>(Compiler.getPreprocessorOpts(),
93-
Diags, LangOpts, Sources,
93+
Diags, LangOpts, CGOpts, Sources,
9494
*HeaderInfo, ModuleLoader,
9595
/*IILookup=*/nullptr,
9696
/*OwnsHeaderSearch=*/false);
9797
PP->Initialize(Compiler.getTarget(), Compiler.getAuxTarget());
9898
InitializePreprocessor(*PP, Compiler.getPreprocessorOpts(),
9999
Compiler.getPCHContainerReader(),
100-
Compiler.getFrontendOpts(), Compiler.getCodeGenOpts());
100+
Compiler.getFrontendOpts());
101101
ApplyHeaderSearchOptions(*HeaderInfo, HSOpts, LangOpts,
102102
Compiler.getTarget().getTriple());
103103
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ class ExpandModularHeadersPPCallbacks : public PPCallbacks {
131131
DiagnosticOptions DiagOpts;
132132
DiagnosticsEngine Diags;
133133
LangOptions LangOpts;
134+
CodeGenOptions CGOpts;
134135
HeaderSearchOptions HSOpts;
135136
TrivialModuleLoader ModuleLoader;
136137

clang-tools-extra/clangd/ModulesBuilder.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ bool IsModuleFileUpToDate(PathRef ModuleFilePath,
194194

195195
LangOptions LangOpts;
196196
LangOpts.SkipODRCheckInGMF = true;
197+
CodeGenOptions CGOpts;
197198

198199
FileManager FileMgr(FileSystemOptions(), VFS);
199200

@@ -204,7 +205,7 @@ bool IsModuleFileUpToDate(PathRef ModuleFilePath,
204205

205206
PreprocessorOptions PPOpts;
206207
TrivialModuleLoader ModuleLoader;
207-
Preprocessor PP(PPOpts, *Diags, LangOpts, SourceMgr, HeaderInfo,
208+
Preprocessor PP(PPOpts, *Diags, LangOpts, CGOpts, SourceMgr, HeaderInfo,
208209
ModuleLoader);
209210

210211
IntrusiveRefCntPtr<ModuleCache> ModCache = createCrossProcessModuleCache();

0 commit comments

Comments
 (0)