diff options
| author | Michael Gottesman <mgottesman@apple.com> | 2013-08-22 23:45:24 +0000 |
|---|---|---|
| committer | Michael Gottesman <mgottesman@apple.com> | 2013-08-22 23:45:24 +0000 |
| commit | 58a9b4388bcace0f332205f960c6c8705fb5a24b (patch) | |
| tree | 87e5979a9d229f821da08e1bbc9c7ad04eb5e1f7 | |
| parent | 80075c482c474c39bd06402550211c314c178404 (diff) | |
| download | llvm-58a9b4388bcace0f332205f960c6c8705fb5a24b.tar.gz llvm-58a9b4388bcace0f332205f960c6c8705fb5a24b.tar.bz2 llvm-58a9b4388bcace0f332205f960c6c8705fb5a24b.tar.xz | |
[stack protector] Work around an issue with the BMOVPCB_CALL instruction on ARM by disabling does not return on __stack_chk_fail.
This is to fix the bots while I look to see if there is something I can do here.
rdar://14811848
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189076 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/ARM/stack-protector-bmovpcb_call.ll | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 77a3c51169..30fde54e50 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -1809,7 +1809,7 @@ SelectionDAGBuilder::visitSPDescriptorFailure(StackProtectorDescriptor &SPD) { const TargetLowering *TLI = TM.getTargetLowering(); SDValue Chain = TLI->makeLibCall(DAG, RTLIB::STACKPROTECTOR_CHECK_FAIL, MVT::isVoid, 0, 0, false, getCurSDLoc(), - true, false).second; + false, false).second; DAG.setRoot(Chain); } diff --git a/test/CodeGen/ARM/stack-protector-bmovpcb_call.ll b/test/CodeGen/ARM/stack-protector-bmovpcb_call.ll new file mode 100644 index 0000000000..f5cda14861 --- /dev/null +++ b/test/CodeGen/ARM/stack-protector-bmovpcb_call.ll @@ -0,0 +1,32 @@ +; RUN: llc -O3 -mcpu=swift -mtriple=armv7s-apple-ios6.0.0 %s -o /dev/null +; rdar://14811848 + +; Make sure that we do not emit the BMOVPCB_CALL instruction for now or if we +; fix the assumptions in its implementation that we do not crash when doing it. + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32-S32" +target triple = "armv7s-apple-ios6.0.0" + +@main.title = private unnamed_addr constant [15 x i8] c"foo and stuff\0A\00", align 1 +@.str = private unnamed_addr constant [3 x i8] c"%s\00", align 1 + +; Function Attrs: nounwind optsize ssp +define i32 @main() #0 { +entry: + %title = alloca [15 x i8], align 1 + %0 = getelementptr inbounds [15 x i8]* %title, i32 0, i32 0 + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %0, i8* getelementptr inbounds ([15 x i8]* @main.title, i32 0, i32 0), i32 15, i32 1, i1 false) + %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([3 x i8]* @.str, i32 0, i32 0), i8* %0) #3 + ret i32 0 +} + +; Function Attrs: nounwind +declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture readonly, i32, i32, i1) #1 + +; Function Attrs: nounwind optsize +declare i32 @printf(i8* nocapture readonly, ...) #2 + +attributes #0 = { nounwind optsize ssp "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-frame-pointer-elim-non-leaf"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #1 = { nounwind } +attributes #2 = { nounwind optsize "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-frame-pointer-elim-non-leaf"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #3 = { nounwind optsize } |