Revert r330442, CodeGen/no-ident-version.c is failing on PPC

llvm-svn: 330451
This commit is contained in:
Mikhail Maltsev 2018-04-20 17:14:39 +00:00
parent 690c828b0b
commit 42b2a0e162
7 changed files with 3 additions and 33 deletions

View File

@ -396,10 +396,7 @@ def O_flag : Flag<["-"], "O">, Flags<[CC1Option]>, Alias<O>, AliasArgs<["2"]>;
def Ofast : Joined<["-"], "Ofast">, Group<O_Group>, Flags<[CC1Option]>;
def P : Flag<["-"], "P">, Flags<[CC1Option]>, Group<Preprocessor_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;

View File

@ -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.

View File

@ -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,

View File

@ -571,8 +571,7 @@ void CodeGenModule::Release() {
if (DebugInfo)
DebugInfo->finalize();
if (getCodeGenOpts().EmitVersionIdentMetadata)
EmitVersionIdentMetadata();
EmitVersionIdentMetadata();
EmitTargetMetadata();
}

View File

@ -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,

View File

@ -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;
}

View File

@ -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) {}