RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00
Code Issues Projects Releases Wiki Activity

[X86] Fix prolog/epilog mismatch for stack protectors on win32-macho.

Browse Source 
The xor'ing behaviour is only used for msvc/crt environments, when we're targeting
macho the guard load code doesn't know about the xor in the epilog. Disable xor'ing
when targeting win32-macho to be consistent.

Differential Revision: https://reviews.llvm.org/D71095
This commit is contained in:
Amara Emerson 2019-12-05 15:41:50 -08:00
parent b50dc04b3d
commit c4c92d3e17
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/X86/X86ISelLowering.cpp
View File

@ -1986,7 +1986,7 @@ bool X86TargetLowering::useLoadStackGuardNode() const {
bool X86TargetLowering::useStackGuardXorFP() const {
// Currently only MSVC CRTs XOR the frame pointer into the stack guard value.
return Subtarget.getTargetTriple().isOSMSVCRT();
return Subtarget.getTargetTriple().isOSMSVCRT() && !Subtarget.isTargetMachO();
}
SDValue X86TargetLowering::emitStackGuardXorFP(SelectionDAG &DAG, SDValue Val,

57
test/CodeGen/X86/stack-protector-strong-macho-win32-xor.ll Normal file
View File

@ -0,0 +1,57 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=x86_64-pc-windows-macho -O0 < %s -o - | FileCheck %s
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-pc-windows-macho"
; This test checks that on Win32 MachO targets we don't xor the cookie with rbp before checking.
@.str = private unnamed_addr constant [15 x i8] c"Hello World!\0A \00", align 1
define dso_local i32 @main(i32 %argc, i8** %argv, ...) #0 {
; CHECK-LABEL: main:
; CHECK: ## %bb.0: ## %entry
; CHECK-NEXT: pushq %rbp
; CHECK-NEXT: .cfi_def_cfa_offset 16
; CHECK-NEXT: .cfi_offset %rbp, -16
; CHECK-NEXT: movq %rsp, %rbp
; CHECK-NEXT: .cfi_def_cfa_register %rbp
; CHECK-NEXT: subq $336, %rsp ## imm = 0x150
; CHECK-NEXT: movq ___security_cookie@{{.*}}(%rip), %rax
; CHECK-NEXT: movq (%rax), %rax
; CHECK-NEXT: movq %rax, -8(%rbp)
; CHECK-NEXT: movl %ecx, -276(%rbp)
; CHECK-NEXT: movq %rdx, -288(%rbp)
; CHECK-NEXT: movslq -276(%rbp), %rax
; CHECK-NEXT: movb $1, -272(%rbp,%rax)
; CHECK-NEXT: leaq {{.*}}(%rip), %rcx
; CHECK-NEXT: callq _printf
; CHECK-NEXT: movq -8(%rbp), %rcx
; CHECK-NEXT: movl %eax, {{[-0-9]+}}(%r{{[sb]}}p) ## 4-byte Spill
; CHECK-NEXT: callq ___security_check_cookie
; CHECK-NEXT: xorl %eax, %eax
; CHECK-NEXT: addq $336, %rsp ## imm = 0x150
; CHECK-NEXT: popq %rbp
; CHECK-NEXT: retq
entry:
%argc.addr = alloca i32, align 4
%argv.addr = alloca i8**, align 8
%Buffer = alloca [256 x i8], align 16
store i32 %argc, i32* %argc.addr, align 4
store i8** %argv, i8*** %argv.addr, align 8
%0 = load i32, i32* %argc.addr, align 4
%idxprom = sext i32 %0 to i64
%arrayidx = getelementptr inbounds [256 x i8], [256 x i8]* %Buffer, i64 0, i64 %idxprom
store i8 1, i8* %arrayidx, align 1
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([15 x i8], [15 x i8]* @.str, i64 0, i64 0))
ret i32 0
}
declare dso_local i32 @printf(i8*, ...) #1
attributes #0 = { sspstrong "frame-pointer"="all" "stack-protector-buffer-size"="8"}
attributes #1 = { "frame-pointer"="all" "stack-protector-buffer-size"="8" }
!llvm.module.flags = !{!0, !1}
!llvm.ident = !{!2}
!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{i32 7, !"PIC Level", i32 2}
!2 = !{!"clang version 10.0.0"}