Skip to content

Commit 1ec3010

Browse files
committed
Darwin: Use the GOT to reference ___stack_chk_guard.
e018cbf changed the default behaviour for Darwin, and this breaks some existing software. rdar://110350601
1 parent 6fb57f7 commit 1ec3010

File tree

3 files changed

+73
-2
lines changed

3 files changed

+73
-2
lines changed

llvm/lib/CodeGen/TargetLoweringBase.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,8 @@ void TargetLoweringBase::insertSSPDeclarations(Module &M) const {
20012001
// FreeBSD has "__stack_chk_guard" defined externally on libc.so
20022002
if (M.getDirectAccessExternalData() &&
20032003
!TM.getTargetTriple().isWindowsGNUEnvironment() &&
2004-
!TM.getTargetTriple().isOSFreeBSD())
2004+
!TM.getTargetTriple().isOSFreeBSD() &&
2005+
!TM.getTargetTriple().isOSDarwin())
20052006
GV->setDSOLocal(true);
20062007
}
20072008
}

llvm/lib/Target/X86/X86ISelLowering.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3082,7 +3082,8 @@ Value *X86TargetLowering::getIRStackGuard(IRBuilderBase &IRB) const {
30823082
GV = new GlobalVariable(*M, Ty, false, GlobalValue::ExternalLinkage,
30833083
nullptr, GuardSymb, nullptr,
30843084
GlobalValue::NotThreadLocal, AddressSpace);
3085-
GV->setDSOLocal(M->getDirectAccessExternalData());
3085+
if (!Subtarget.isTargetDarwin())
3086+
GV->setDSOLocal(M->getDirectAccessExternalData());
30863087
}
30873088
return GV;
30883089
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
2+
; RUN: llc -mtriple=aarch64-apple-darwin < %s -o - | FileCheck %s
3+
4+
@.str = private unnamed_addr constant [4 x i8] c"%s\0A\00", align 1
5+
6+
; Check we use the GOT to reference ___stack_chk_guard on Darwin
7+
8+
define void @test(ptr %a) #0 {
9+
; CHECK-LABEL: test:
10+
; CHECK: ; %bb.0: ; %entry
11+
; CHECK-NEXT: sub sp, sp, #80
12+
; CHECK-NEXT: .cfi_def_cfa_offset 80
13+
; CHECK-NEXT: stp x20, x19, [sp, #48] ; 16-byte Folded Spill
14+
; CHECK-NEXT: stp x29, x30, [sp, #64] ; 16-byte Folded Spill
15+
; CHECK-NEXT: .cfi_offset w30, -8
16+
; CHECK-NEXT: .cfi_offset w29, -16
17+
; CHECK-NEXT: .cfi_offset w19, -24
18+
; CHECK-NEXT: .cfi_offset w20, -32
19+
; CHECK-NEXT: Lloh0:
20+
; CHECK-NEXT: adrp x8, ___stack_chk_guard@GOTPAGE
21+
; CHECK-NEXT: mov x1, x0
22+
; CHECK-NEXT: add x19, sp, #16
23+
; CHECK-NEXT: Lloh1:
24+
; CHECK-NEXT: ldr x8, [x8, ___stack_chk_guard@GOTPAGEOFF]
25+
; CHECK-NEXT: Lloh2:
26+
; CHECK-NEXT: ldr x8, [x8]
27+
; CHECK-NEXT: str x8, [sp, #40]
28+
; CHECK-NEXT: str x0, [sp, #8]
29+
; CHECK-NEXT: add x0, sp, #16
30+
; CHECK-NEXT: bl _strcpy
31+
; CHECK-NEXT: Lloh3:
32+
; CHECK-NEXT: adrp x0, l_.str@PAGE
33+
; CHECK-NEXT: Lloh4:
34+
; CHECK-NEXT: add x0, x0, l_.str@PAGEOFF
35+
; CHECK-NEXT: str x19, [sp]
36+
; CHECK-NEXT: bl _printf
37+
; CHECK-NEXT: Lloh5:
38+
; CHECK-NEXT: adrp x8, ___stack_chk_guard@GOTPAGE
39+
; CHECK-NEXT: Lloh6:
40+
; CHECK-NEXT: ldr x8, [x8, ___stack_chk_guard@GOTPAGEOFF]
41+
; CHECK-NEXT: ldr x9, [sp, #40]
42+
; CHECK-NEXT: Lloh7:
43+
; CHECK-NEXT: ldr x8, [x8]
44+
; CHECK-NEXT: cmp x8, x9
45+
; CHECK-NEXT: b.ne LBB0_2
46+
; CHECK-NEXT: ; %bb.1: ; %entry
47+
; CHECK-NEXT: ldp x29, x30, [sp, #64] ; 16-byte Folded Reload
48+
; CHECK-NEXT: ldp x20, x19, [sp, #48] ; 16-byte Folded Reload
49+
; CHECK-NEXT: add sp, sp, #80
50+
; CHECK-NEXT: ret
51+
; CHECK-NEXT: LBB0_2: ; %entry
52+
; CHECK-NEXT: bl ___stack_chk_fail
53+
; CHECK-NEXT: .loh AdrpLdrGotLdr Lloh5, Lloh6, Lloh7
54+
; CHECK-NEXT: .loh AdrpAdd Lloh3, Lloh4
55+
; CHECK-NEXT: .loh AdrpLdrGotLdr Lloh0, Lloh1, Lloh2
56+
entry:
57+
%a.addr = alloca ptr, align 8
58+
%buf = alloca [16 x i8], align 16
59+
store ptr %a, ptr %a.addr, align 8
60+
%0 = load ptr, ptr %a.addr, align 8
61+
%call = call ptr @strcpy(ptr %buf, ptr %0)
62+
%call2 = call i32 (ptr, ...) @printf(ptr @.str, ptr %buf)
63+
ret void
64+
}
65+
66+
declare ptr @strcpy(ptr, ptr)
67+
declare i32 @printf(ptr, ...)
68+
69+
attributes #0 = { ssp }

0 commit comments

Comments
 (0)