From 42b2a0e162933d3d942c3dc259344bea67d489ad Mon Sep 17 00:00:00 2001 From: Mikhail Maltsev Date: Fri, 20 Apr 2018 17:14:39 +0000 Subject: [PATCH] Revert r330442, CodeGen/no-ident-version.c is failing on PPC llvm-svn: 330451 --- clang/include/clang/Driver/Options.td | 5 +---- .../include/clang/Frontend/CodeGenOptions.def | 1 - clang/lib/CodeGen/CGDebugInfo.cpp | 3 +-- clang/lib/CodeGen/CodeGenModule.cpp | 3 +-- clang/lib/Driver/ToolChains/Clang.cpp | 3 --- clang/lib/Frontend/CompilerInvocation.cpp | 2 -- clang/test/CodeGen/no-ident-version.c | 19 ------------------- 7 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 clang/test/CodeGen/no-ident-version.c diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 5290d8ad482d..ca6267dad4e3 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -396,10 +396,7 @@ def O_flag : Flag<["-"], "O">, Flags<[CC1Option]>, Alias, AliasArgs<["2"]>; def Ofast : Joined<["-"], "Ofast">, Group, Flags<[CC1Option]>; def P : Flag<["-"], "P">, Flags<[CC1Option]>, Group, HelpText<"Disable linemarker output in -E mode">; -def Qy : Flag<["-"], "Qy">, Flags<[CC1Option]>, - HelpText<"Emit metadata containing compiler name and version">; -def Qn : Flag<["-"], "Qn">, Flags<[CC1Option]>, - HelpText<"Do not emit metadata containing compiler name and version">; +def Qn : Flag<["-"], "Qn">, IgnoredGCCCompat; def Qunused_arguments : Flag<["-"], "Qunused-arguments">, Flags<[DriverOption, CoreOption]>, HelpText<"Don't emit warning for unused driver arguments">; def Q : Flag<["-"], "Q">, IgnoredGCCCompat; diff --git a/clang/include/clang/Frontend/CodeGenOptions.def b/clang/include/clang/Frontend/CodeGenOptions.def index 1684dbdb5576..684f99e1de30 100644 --- a/clang/include/clang/Frontend/CodeGenOptions.def +++ b/clang/include/clang/Frontend/CodeGenOptions.def @@ -69,7 +69,6 @@ CODEGENOPT(EmitDeclMetadata , 1, 0) ///< Emit special metadata indicating what ///< Decl* various IR entities came from. ///< Only useful when running CodeGen as a ///< subroutine. -CODEGENOPT(EmitVersionIdentMetadata , 1, 1) ///< Emit compiler version metadata. CODEGENOPT(EmitGcovArcs , 1, 0) ///< Emit coverage data files, aka. GCDA. CODEGENOPT(EmitGcovNotes , 1, 0) ///< Emit coverage "notes" files, aka GCNO. CODEGENOPT(EmitOpenCLArgMetadata , 1, 0) ///< Emit OpenCL kernel arg metadata. diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 474018c065e6..bdd326d70e40 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -577,8 +577,7 @@ void CGDebugInfo::CreateCompileUnit() { remapDIPath(getCurrentDirname()), CSInfo, getSource(SM, SM.getMainFileID())), - CGOpts.EmitVersionIdentMetadata ? Producer : "", - LO.Optimize || CGOpts.PrepareForLTO || CGOpts.EmitSummaryIndex, + Producer, LO.Optimize || CGOpts.PrepareForLTO || CGOpts.EmitSummaryIndex, CGOpts.DwarfDebugFlags, RuntimeVers, CGOpts.EnableSplitDwarf ? "" : CGOpts.SplitDwarfFile, EmissionKind, 0 /* DWOid */, CGOpts.SplitDwarfInlining, CGOpts.DebugInfoForProfiling, diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 063b9be4cd02..63fcc8fbce0b 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -571,8 +571,7 @@ void CodeGenModule::Release() { if (DebugInfo) DebugInfo->finalize(); - if (getCodeGenOpts().EmitVersionIdentMetadata) - EmitVersionIdentMetadata(); + EmitVersionIdentMetadata(); EmitTargetMetadata(); } diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 6c5e2caae4ac..a3cb0f21ed55 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4408,9 +4408,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } } - if (!Args.hasFlag(options::OPT_Qy, options::OPT_Qn, true)) - CmdArgs.push_back("-Qn"); - // -fcommon is the default unless compiling kernel code or the target says so bool NoCommonDefault = KernelOrKext || isNoCommonDefault(RawTriple); if (!Args.hasFlag(options::OPT_fcommon, options::OPT_fno_common, diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index f904e65e7243..67e15b41add1 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1112,8 +1112,6 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, Opts.EmitCheckPathComponentsToStrip = getLastArgIntValue( Args, OPT_fsanitize_undefined_strip_path_components_EQ, 0, Diags); - Opts.EmitVersionIdentMetadata = Args.hasFlag(OPT_Qy, OPT_Qn, true); - return Success; } diff --git a/clang/test/CodeGen/no-ident-version.c b/clang/test/CodeGen/no-ident-version.c deleted file mode 100644 index 35f84f0500de..000000000000 --- a/clang/test/CodeGen/no-ident-version.c +++ /dev/null @@ -1,19 +0,0 @@ -// RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited -o - %s \ -// RUN: | FileCheck --check-prefix=CHECK-NONE %s -// RUN: %clang_cc1 -Qn -emit-llvm -debug-info-kind=limited -o - %s \ -// RUN: | FileCheck --check-prefix=CHECK-QN %s -// RUN: %clang_cc1 -Qy -emit-llvm -debug-info-kind=limited -o - %s \ -// RUN: | FileCheck --check-prefix=CHECK-QY %s - -// CHECK-NONE: define i32 @main() -// CHECK-NONE: llvm.ident -// CHECK-NONE: producer: - -// CHECK-QN: define i32 @main() -// CHECK-QN-NOT: llvm.ident -// CHECK-QN-NOT: producer: - -// CHECK-QY: define i32 @main() -// CHECK-QY: llvm.ident -// CHECK-QY: producer: -int main(void) {}