Author: Aiden Grossman Date: 2022-07-29T18:51:48-07:00 New Revision: afb4efd3bcc68ab95bf3c35183bedbdbf038356a
URL: https://github.com/llvm/llvm-project/commit/afb4efd3bcc68ab95bf3c35183bedbdbf038356a DIFF: https://github.com/llvm/llvm-project/commit/afb4efd3bcc68ab95bf3c35183bedbdbf038356a.diff LOG: Fix lack of cc1 flag in llvmcmd sections when assertions are enabled Currently when assertions are enabled, the cc1 flag is not inserted into the llvmcmd section of object files with embedded bitcode. This deviates from the normal behavior where this is the first flag that is inserted. This error stems from incorrect use of the function generateCC1CommandLine() which requires manually adding in the -cc1 flag which is currently not done. Reviewed By: jansvoboda11 Differential Revision: https://reviews.llvm.org/D130620 Added: Modified: clang/lib/Frontend/CompilerInvocation.cpp clang/unittests/Frontend/CompilerInvocationTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 2dd96e68bb92f..82dcc2a59e0f9 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -4544,7 +4544,10 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Invocation, return CreateFromArgsImpl(Invocation, CommandLineArgs, Diags, Argv0); }, [](CompilerInvocation &Invocation, SmallVectorImpl<const char *> &Args, - StringAllocator SA) { Invocation.generateCC1CommandLine(Args, SA); }, + StringAllocator SA) { + Args.push_back("-cc1"); + Invocation.generateCC1CommandLine(Args, SA); + }, Invocation, DummyInvocation, CommandLineArgs, Diags, Argv0); } diff --git a/clang/unittests/Frontend/CompilerInvocationTest.cpp b/clang/unittests/Frontend/CompilerInvocationTest.cpp index fe6785257e926..d4c6981df17c2 100644 --- a/clang/unittests/Frontend/CompilerInvocationTest.cpp +++ b/clang/unittests/Frontend/CompilerInvocationTest.cpp @@ -23,6 +23,7 @@ using namespace clang; using ::testing::Contains; using ::testing::HasSubstr; using ::testing::StrEq; +using ::testing::StartsWith; namespace { class CommandLineTest : public ::testing::Test { @@ -145,6 +146,26 @@ TEST_F(CommandLineTest, BoolOptionDefaultTrueSingleFlagPresent) { ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fno-temp-file"))); } +TEST_F(CommandLineTest, CC1FlagPresentWhenDoingRoundTrip) { + const char *Args[] = {"-cc1", "-round-trip-args"}; + + ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags)); + + ASSERT_THAT(std::string(Invocation.getCodeGenOpts().CmdArgs.begin(), + Invocation.getCodeGenOpts().CmdArgs.end()), + StartsWith("-cc1")); +} + +TEST_F(CommandLineTest, CC1FlagPresentWhenNotDoingRoundTrip) { + const char *Args[] = {"-cc1", "-no-round-trip-args"}; + + ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags)); + + ASSERT_THAT(std::string(Invocation.getCodeGenOpts().CmdArgs.begin(), + Invocation.getCodeGenOpts().CmdArgs.end()), + StartsWith("-cc1")); +} + TEST_F(CommandLineTest, BoolOptionDefaultTrueSingleFlagUnknownPresent) { const char *Args[] = {"-ftemp-file"}; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits