RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-14 23:48:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SelectionDAGBuilder: Fix SPDescriptor not resetting GuardReg

Browse Source 
This was causing problems when some functions use a GuardReg and some
don't as can happen when mixing SelectionDAG and FastISel generated
functions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246075 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matthias Braun 2015-08-26 20:46:52 +00:00
parent f042f1cd8d
commit 143619a66d
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
View File

@ -516,6 +516,7 @@ private:
void resetPerFunctionState() {
FailureMBB = nullptr;
Guard = nullptr;
GuardReg = 0;
}
MachineBasicBlock *getParentMBB() { return ParentMBB; }

44
test/CodeGen/X86/fast-isel-stackcheck.ll Normal file
View File

@ -0,0 +1,44 @@
; RUN: llc -o - %s | FileCheck %s
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx"
; selectiondag stack protector uses a GuardReg which the fast-isel stack
; protection code did not but the state was not reset properly.
; The optnone attribute on @bar forces fast-isel.
; CHECK-LABEL: foo:
; CHECK: movq ___stack_chk_guard@GOTPCREL(%rip), %rax
; CHECK-NOT: movq ___stack_chk_guard@GOTPCREL(%rip), %rax
define void @foo() #0 {
entry:
%_tags = alloca [3 x i32], align 4
ret void
}
; CHECK-LABEL: bar:
; CHECK: movq ___stack_chk_guard@GOTPCREL(%rip), %rax
; CHECK: movq ___stack_chk_guard@GOTPCREL(%rip), %rax
define void @bar() #1 {
entry:
%vt = alloca [2 x double], align 16
br i1 undef, label %cleanup.4091, label %for.cond.3850
unreachable:
unreachable
for.cond.3850:
br i1 undef, label %land.rhs.3853, label %land.end.3857
land.rhs.3853:
br label %land.end.3857
land.end.3857:
%0 = phi i1 [ false, %for.cond.3850 ], [ false, %land.rhs.3853 ]
br i1 %0, label %unreachable, label %unreachable
cleanup.4091:
ret void
}
attributes #0 = { ssp }
attributes #1 = { noinline optnone ssp }