From 13c97a89054125ab8e2b51fe27e3c1ae2dd252f1 Mon Sep 17 00:00:00 2001 From: Robert Widmann Date: Wed, 11 Nov 2020 14:26:25 -0800 Subject: [PATCH] [NFC] Downgrade CompilerInvocation to FrontendOptions --- lib/FrontendTool/FrontendTool.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp index e67962af250..2756fd899ad 100644 --- a/lib/FrontendTool/FrontendTool.cpp +++ b/lib/FrontendTool/FrontendTool.cpp @@ -461,10 +461,9 @@ static bool compileLLVMIR(CompilerInstance &Instance) { Module.get(), inputsAndOutputs.getSingleOutputFilename()); } -static void verifyGenericSignaturesIfNeeded(const CompilerInvocation &Invocation, +static void verifyGenericSignaturesIfNeeded(const FrontendOptions &opts, ASTContext &Context) { - auto verifyGenericSignaturesInModule = - Invocation.getFrontendOptions().VerifyGenericSignaturesInModule; + auto verifyGenericSignaturesInModule = opts.VerifyGenericSignaturesInModule; if (verifyGenericSignaturesInModule.empty()) return; if (auto module = Context.getModuleByName(verifyGenericSignaturesInModule)) @@ -932,7 +931,7 @@ static void performEndOfPipelineActions(CompilerInstance &Instance) { ctx.verifyAllLoadedModules(); // Verify generic signatures if we've been asked to. - verifyGenericSignaturesIfNeeded(Invocation, ctx); + verifyGenericSignaturesIfNeeded(Invocation.getFrontendOptions(), ctx); } // Emit any additional outputs that we only need for a successful compilation.