From 0a90143edf01b50082154223f05e26413f0c16db Mon Sep 17 00:00:00 2001 From: Shubham Sandeep Rastogi Date: Wed, 21 Aug 2024 16:08:43 -0700 Subject: [PATCH] Fix mismerge with remote cache path error When using the -fcasid-output option, even if a remote cache path is not passed we can still see the error: error: '-fcasid-output' is incompatible with remote caching backend This patch fixes that bug --- clang/lib/Frontend/CompilerInvocation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 61cf2e4d6c919..955e64427f9d4 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -4976,13 +4976,13 @@ bool CompilerInvocation::CreateFromArgsImpl( Res.getCASOpts()); // BEGIN MCCAS - if (!Res.getFrontendOpts().CompilationCachingServicePath.empty()) + if (!Res.getFrontendOpts().CompilationCachingServicePath.empty()) { if (Res.getCodeGenOpts().UseCASBackend) Diags.Report(diag::err_fe_incompatible_option_with_remote_cache) << "-fcas-backend"; - if (Res.getFrontendOpts().WriteOutputAsCASID) { - Diags.Report(diag::err_fe_incompatible_option_with_remote_cache) - << "-fcasid-output"; + if (Res.getFrontendOpts().WriteOutputAsCASID) + Diags.Report(diag::err_fe_incompatible_option_with_remote_cache) + << "-fcasid-output"; } // END MCCAS