Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-03-04 16:41:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Clang FE, SystemZ] Don't add "true" value for the "mnop-mcount" attribute.

Browse Source 
Let the "mnop-mcount" function attribute simply be present or non-present.
Update SystemZ backend as well to use hasFnAttribute() instead.

Review: Ulrich Weigand
https://reviews.llvm.org/D71669
This commit is contained in:
Jonas Paulsson 2019-12-18 10:12:41 -08:00
parent fc0731b98a
commit ca520592c0
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/CodeGen/CodeGenFunction.cpp
View File

@ -966,7 +966,7 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, QualType RetTy,
if (!CGM.getCodeGenOpts().CallFEntry)
CGM.getDiags().Report(diag::err_opt_not_valid_without_opt)
<< "-mnop-mcount" << "-mfentry";
Fn->addFnAttr("mnop-mcount", "true");
Fn->addFnAttr("mnop-mcount");
}
}
}

4
clang/test/CodeGen/mnop-mcount.c
View File

@ -17,9 +17,9 @@ int __attribute__((no_instrument_function)) no_instrument(void) {
return foo();
}
//CHECK: attributes #0 = { {{.*}}"mnop-mcount"="true"{{.*}} }
//CHECK: attributes #0 = { {{.*}}"mnop-mcount"{{.*}} }
//CHECK: attributes #1 = { {{.*}} }
//CHECK-NOT: attributes #1 = { {{.*}}"mnop-mcount"="true"{{.*}} }
//CHECK-NOT: attributes #1 = { {{.*}}"mnop-mcount"{{.*}} }
//NOMFENTRY: error: option '-mnop-mcount' cannot be specified without '-mfentry'
//NOPG-NOT: attributes #0 = { {{.*}}"mnop-mcount"{{.*}} }
//NOPG-NOT: attributes #1 = { {{.*}}"mnop-mcount"{{.*}} }

3
llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
View File

@ -553,8 +553,7 @@ static unsigned EmitNop(MCContext &OutContext, MCStreamer &OutStreamer,
void SystemZAsmPrinter::LowerFENTRY_CALL(const MachineInstr &MI,
SystemZMCInstLower &Lower) {
MCContext &Ctx = MF->getContext();
if (MF->getFunction().getFnAttribute("mnop-mcount")
.getValueAsString() == "true") {
if (MF->getFunction().hasFnAttribute("mnop-mcount")) {
EmitNop(Ctx, *OutStreamer, 6, getSubtargetInfo());
return;
}

2
llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp
View File

@ -347,7 +347,7 @@ public:
bool runOnMachineFunction(MachineFunction &MF) override {
const Function &F = MF.getFunction();
if (F.getFnAttribute("mnop-mcount").getValueAsString() == "true" &&
if (F.hasFnAttribute("mnop-mcount") &&
F.getFnAttribute("fentry-call").getValueAsString() != "true")
report_fatal_error("mnop-mcount only supported with fentry-call");

2
llvm/test/CodeGen/SystemZ/mnop-mcount-01.ll
View File

@ -22,5 +22,5 @@ entry:
}
attributes #0 = { "fentry-call"="true" }
attributes #1 = { "fentry-call"="true" "mnop-mcount"="true" }
attributes #1 = { "fentry-call"="true" "mnop-mcount" }

3
llvm/test/CodeGen/SystemZ/mnop-mcount-02.ll
View File

@ -7,5 +7,4 @@ entry:
ret void
}
attributes #0 = { "instrument-function-entry-inlined"="mcount" "mnop-mcount"="true" }
attributes #0 = { "instrument-function-entry-inlined"="mcount" "mnop-mcount" }