RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 19:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix the GCC test suite issue exposed by r127477, which was caused by stack

Browse Source 
protector insertion not working correctly with unreachable code. Since that
revision was rolled out, this test doesn't actual fail before this fix.

llvm-svn: 127497
This commit is contained in:
Cameron Zwarich 2011-03-11 21:51:56 +00:00
parent 78afadfa5d
commit 39a49276db
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CodeGen/StackProtector.cpp
View File

@ -219,8 +219,8 @@ bool StackProtector::InsertStackProtectors() {
// Split the basic block before the return instruction.
BasicBlock *NewBB = BB->splitBasicBlock(RI, "SP_return");
if (DT) {
DT->addNewBlock(NewBB, DT->isReachableFromEntry(BB) ? BB : 0);
if (DT && DT->isReachableFromEntry(BB)) {
DT->addNewBlock(NewBB, BB);
FailBBDom = DT->findNearestCommonDominator(FailBBDom, BB);
}
@ -242,7 +242,7 @@ bool StackProtector::InsertStackProtectors() {
// statements in the function.
if (!FailBB) return false;
if (DT)
if (DT && FailBBDom)
DT->addNewBlock(FailBB, FailBBDom);
return true;

19
test/CodeGen/X86/unreachable-stack-protector.ll Normal file
View File

@ -0,0 +1,19 @@
; RUN: llc < %s | FileCheck %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
target triple = "x86_64-apple-darwin10.0.0"
declare i64 @llvm.objectsize.i64(i8*, i1) nounwind readnone
define void @test5() nounwind optsize noinline ssp {
entry:
; CHECK: movq ___stack_chk_guard@GOTPCREL(%rip)
%buf = alloca [64 x i8], align 16
%0 = call i64 @llvm.objectsize.i64(i8* undef, i1 false)
br i1 false, label %if.end, label %if.then
if.then: ; preds = %entry
unreachable
if.end: ; preds = %entry
ret void
}