[CodeGen] Generalize trap emission after SP check fail #109744
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
backend:AArch64
backend:X86
llvm:globalisel
llvm:SelectionDAG
|
@llvm/pr-subscribers-backend-webassembly @llvm/pr-subscribers-backend-aarch64 Author: duk (duk-37) ChangesGeneralize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel. Full diff: https://github.com/llvm/llvm-project/pull/109744.diff 5 Files Affected:
diff --git a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
index 8e860a1f740295..8486d9a1477eb6 100644
--- a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
@@ -3807,16 +3807,11 @@ bool IRTranslator::emitSPDescriptorFailure(StackProtectorDescriptor &SPD,
return false;
}
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- const TargetMachine &TM = MF->getTarget();
- if (TM.getTargetTriple().isPS() || TM.getTargetTriple().isWasm()) {
- LLVM_DEBUG(dbgs() << "Unhandled trap emission for stack protector fail\n");
- return false;
- }
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = TLI->getTargetMachine().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
+ CurBuilder->buildInstr(TargetOpcode::G_TRAP);
+
return true;
}
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 25213f587116d5..5004756c0ab9c1 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3183,15 +3183,10 @@ SelectionDAGBuilder::visitSPDescriptorFailure(StackProtectorDescriptor &SPD) {
SDValue Chain = TLI.makeLibCall(DAG, RTLIB::STACKPROTECTOR_CHECK_FAIL,
MVT::isVoid, {}, CallOptions, getCurSDLoc())
.second;
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // Passing 'true' for doesNotReturn above won't generate the trap for us.
- if (TM.getTargetTriple().isPS())
- Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- if (TM.getTargetTriple().isWasm())
+
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = DAG.getTarget().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
DAG.setRoot(Chain);
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..8f1eafa6ca9feb
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
@@ -0,0 +1,26 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck -check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..3efb71c0f78c32
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..ecf4c9811d46c6
--- /dev/null
+++ b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+define void @test() nounwind ssp {
+; NOTRAP-LABEL: test
+; NOTRAP: callq __stack_chk_fail
+; NOTRAP-NOT: ud2
+
+; TRAP-LABEL: test
+; TRAP: callq __stack_chk_fail
+; TRAP-NEXT: ud2
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
|
|
@llvm/pr-subscribers-llvm-globalisel Author: duk (duk-37) ChangesGeneralize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel. Full diff: https://github.com/llvm/llvm-project/pull/109744.diff 5 Files Affected:
diff --git a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
index 8e860a1f740295..8486d9a1477eb6 100644
--- a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
@@ -3807,16 +3807,11 @@ bool IRTranslator::emitSPDescriptorFailure(StackProtectorDescriptor &SPD,
return false;
}
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- const TargetMachine &TM = MF->getTarget();
- if (TM.getTargetTriple().isPS() || TM.getTargetTriple().isWasm()) {
- LLVM_DEBUG(dbgs() << "Unhandled trap emission for stack protector fail\n");
- return false;
- }
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = TLI->getTargetMachine().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
+ CurBuilder->buildInstr(TargetOpcode::G_TRAP);
+
return true;
}
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 25213f587116d5..5004756c0ab9c1 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3183,15 +3183,10 @@ SelectionDAGBuilder::visitSPDescriptorFailure(StackProtectorDescriptor &SPD) {
SDValue Chain = TLI.makeLibCall(DAG, RTLIB::STACKPROTECTOR_CHECK_FAIL,
MVT::isVoid, {}, CallOptions, getCurSDLoc())
.second;
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // Passing 'true' for doesNotReturn above won't generate the trap for us.
- if (TM.getTargetTriple().isPS())
- Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- if (TM.getTargetTriple().isWasm())
+
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = DAG.getTarget().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
DAG.setRoot(Chain);
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..8f1eafa6ca9feb
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
@@ -0,0 +1,26 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck -check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..3efb71c0f78c32
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..ecf4c9811d46c6
--- /dev/null
+++ b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+define void @test() nounwind ssp {
+; NOTRAP-LABEL: test
+; NOTRAP: callq __stack_chk_fail
+; NOTRAP-NOT: ud2
+
+; TRAP-LABEL: test
+; TRAP: callq __stack_chk_fail
+; TRAP-NEXT: ud2
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
|
|
@llvm/pr-subscribers-llvm-selectiondag Author: duk (duk-37) ChangesGeneralize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel. Full diff: https://github.com/llvm/llvm-project/pull/109744.diff 5 Files Affected:
diff --git a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
index 8e860a1f740295..8486d9a1477eb6 100644
--- a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
@@ -3807,16 +3807,11 @@ bool IRTranslator::emitSPDescriptorFailure(StackProtectorDescriptor &SPD,
return false;
}
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- const TargetMachine &TM = MF->getTarget();
- if (TM.getTargetTriple().isPS() || TM.getTargetTriple().isWasm()) {
- LLVM_DEBUG(dbgs() << "Unhandled trap emission for stack protector fail\n");
- return false;
- }
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = TLI->getTargetMachine().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
+ CurBuilder->buildInstr(TargetOpcode::G_TRAP);
+
return true;
}
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 25213f587116d5..5004756c0ab9c1 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3183,15 +3183,10 @@ SelectionDAGBuilder::visitSPDescriptorFailure(StackProtectorDescriptor &SPD) {
SDValue Chain = TLI.makeLibCall(DAG, RTLIB::STACKPROTECTOR_CHECK_FAIL,
MVT::isVoid, {}, CallOptions, getCurSDLoc())
.second;
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // Passing 'true' for doesNotReturn above won't generate the trap for us.
- if (TM.getTargetTriple().isPS())
- Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- if (TM.getTargetTriple().isWasm())
+
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = DAG.getTarget().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
DAG.setRoot(Chain);
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..8f1eafa6ca9feb
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
@@ -0,0 +1,26 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck -check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..3efb71c0f78c32
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..ecf4c9811d46c6
--- /dev/null
+++ b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+define void @test() nounwind ssp {
+; NOTRAP-LABEL: test
+; NOTRAP: callq __stack_chk_fail
+; NOTRAP-NOT: ud2
+
+; TRAP-LABEL: test
+; TRAP: callq __stack_chk_fail
+; TRAP-NEXT: ud2
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
|
|
@llvm/pr-subscribers-backend-x86 Author: duk (duk-37) ChangesGeneralize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel. Full diff: https://github.com/llvm/llvm-project/pull/109744.diff 5 Files Affected:
diff --git a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
index 8e860a1f740295..8486d9a1477eb6 100644
--- a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp
@@ -3807,16 +3807,11 @@ bool IRTranslator::emitSPDescriptorFailure(StackProtectorDescriptor &SPD,
return false;
}
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- const TargetMachine &TM = MF->getTarget();
- if (TM.getTargetTriple().isPS() || TM.getTargetTriple().isWasm()) {
- LLVM_DEBUG(dbgs() << "Unhandled trap emission for stack protector fail\n");
- return false;
- }
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = TLI->getTargetMachine().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
+ CurBuilder->buildInstr(TargetOpcode::G_TRAP);
+
return true;
}
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 25213f587116d5..5004756c0ab9c1 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3183,15 +3183,10 @@ SelectionDAGBuilder::visitSPDescriptorFailure(StackProtectorDescriptor &SPD) {
SDValue Chain = TLI.makeLibCall(DAG, RTLIB::STACKPROTECTOR_CHECK_FAIL,
MVT::isVoid, {}, CallOptions, getCurSDLoc())
.second;
- // On PS4/PS5, the "return address" must still be within the calling
- // function, even if it's at the very end, so emit an explicit TRAP here.
- // Passing 'true' for doesNotReturn above won't generate the trap for us.
- if (TM.getTargetTriple().isPS())
- Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
- // WebAssembly needs an unreachable instruction after a non-returning call,
- // because the function return type can be different from __stack_chk_fail's
- // return type (void).
- if (TM.getTargetTriple().isWasm())
+
+ // Emit a trap instruction if we are required to do so.
+ const TargetOptions &TargetOpts = DAG.getTarget().Options;
+ if (TargetOpts.TrapUnreachable && !TargetOpts.NoTrapAfterNoreturn)
Chain = DAG.getNode(ISD::TRAP, getCurSDLoc(), MVT::Other, Chain);
DAG.setRoot(Chain);
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..8f1eafa6ca9feb
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
@@ -0,0 +1,26 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck -check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -global-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck -check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..3efb71c0f78c32
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NO_TRAP_UNREACHABLE %s
+; RUN: llc -mtriple=aarch64 -fast-isel -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP_UNREACHABLE %s
+
+define void @test() nounwind ssp {
+; NO_TRAP_UNREACHABLE-LABEL: test:
+; NO_TRAP_UNREACHABLE: bl __stack_chk_fail
+; NO_TRAP_UNREACHABLE-NOT: brk #0x1
+;
+; TRAP_UNREACHABLE-LABEL: test:
+; TRAP_UNREACHABLE: bl __stack_chk_fail
+; TRAP_UNREACHABLE-NEXT: brk #0x1
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
diff --git a/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
new file mode 100644
index 00000000000000..ecf4c9811d46c6
--- /dev/null
+++ b/llvm/test/CodeGen/X86/stack-protector-trap-unreachable.ll
@@ -0,0 +1,34 @@
+; NOTE: Do not autogenerate, we'll lose the important NOT- check otherwise.
+;; Make sure we emit trap instructions after stack protector checks iff NoTrapAfterNoReturn is false.
+
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel=false -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+;; Make sure FastISel doesn't break anything.
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable=false -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn -o - %s | FileCheck --check-prefix=NOTRAP %s
+; RUN: llc -mtriple=x86_64 -fast-isel -global-isel=false -verify-machineinstrs \
+; RUN: -trap-unreachable -no-trap-after-noreturn=false -o - %s | FileCheck --check-prefix=TRAP %s
+
+define void @test() nounwind ssp {
+; NOTRAP-LABEL: test
+; NOTRAP: callq __stack_chk_fail
+; NOTRAP-NOT: ud2
+
+; TRAP-LABEL: test
+; TRAP: callq __stack_chk_fail
+; TRAP-NEXT: ud2
+
+entry:
+ %buf = alloca [8 x i8]
+ %2 = call i32(ptr) @callee(ptr %buf) nounwind
+ ret void
+}
+
+declare i32 @callee(ptr) nounwind
|
arsenm
reviewed
Sep 24, 2024
| // because the function return type can be different from __stack_chk_fail's | ||
| // return type (void). | ||
| const TargetMachine &TM = MF->getTarget(); | ||
| if (TM.getTargetTriple().isPS() || TM.getTargetTriple().isWasm()) { |
There was a problem hiding this comment.
This is loosing the target specific behaviors? TargetOptions aren't really options for the target. No test changes for this?
There was a problem hiding this comment.
There are existing tests checking this behavior for these targets -- ps4/5 and wasm explicitly override these options.
duk-37
force-pushed
the
generalize-ssp-trap-unreachable
branch
2 times, most recently
from
18197c6 to
8f5a1e7
Compare
arsenm
reviewed
Oct 10, 2024
llvm/test/CodeGen/AArch64/GlobalISel/irtranslator-stack-protector-trap-unreachable.ll
Outdated
Show resolved
Hide resolved
duk-37
force-pushed
the
generalize-ssp-trap-unreachable
branch
from
8f5a1e7 to
f6521b5
Compare
Generalize some target-specific code that emits traps after stack protector failure in SelectionDAG/GlobalIsel and add some tests.
duk-37
force-pushed
the
generalize-ssp-trap-unreachable
branch
from
f6521b5 to
cda3c9a
Compare
arsenm
approved these changes
Oct 11, 2024
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/88/builds/3433 Here is the relevant piece of the build log for the reference |
DanielCChen
pushed a commit
to DanielCChen/llvm-project
that referenced
this pull request
Oct 16, 2024
Generalize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel.
bricknerb
pushed a commit
to bricknerb/llvm-project
that referenced
this pull request
Oct 17, 2024
Generalize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel.
EricWF
pushed a commit
to efcs/llvm-project
that referenced
this pull request
Oct 22, 2024
Generalize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Generalize and improve some target-specific code that emits traps after stack protector failure in SelectionDAG & GlobalIsel.