Skip to content

Commit a705aad

Browse files
zmodemzmodem
committed
Merging r368478:
------------------------------------------------------------------------ r368478 | void | 2019-08-09 22:18:30 +0200 (Fri, 09 Aug 2019) | 16 lines [CodeGen] Require a name for a block addr target Summary: A block address may be used in inline assembly. In which case it requires a name so that the asm parser has something to parse. Creating a name for every block address is a large hammer, but is necessary because at the point when a temp symbol is created we don't necessarily know if it's used in inline asm. This ensures that it exists regardless. Reviewers: nickdesaulniers, craig.topper Subscribers: nathanchance, javed.absar, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D65352 ------------------------------------------------------------------------ llvm-svn: 368678
1 parent 8bb0d04 commit a705aad

File tree

3 files changed

+122
-1
lines changed

3 files changed

+122
-1
lines changed

‎llvm/lib/CodeGen/MachineModuleInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ ArrayRef<MCSymbol *> MMIAddrLabelMap::getAddrLabelSymbolToEmit(BasicBlock *BB) {
121121
BBCallbacks.back().setMap(this);
122122
Entry.Index = BBCallbacks.size() - 1;
123123
Entry.Fn = BB->getParent();
124-
Entry.Symbols.push_back(Context.createTempSymbol());
124+
Entry.Symbols.push_back(Context.createTempSymbol(!BB->hasAddressTaken()));
125125
return Entry.Symbols;
126126
}
127127

‎llvm/test/CodeGen/AArch64/callbr-asm-obj-file.ll

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
; RUN: llc < %s -mtriple=aarch64-unknown-linux-gnu -filetype=obj -o - \
2+
; RUN: | llvm-objdump -triple aarch64-unknown-linux-gnu -d - \
3+
; RUN: | FileCheck %s
4+
5+
%struct.c = type { i1 (...)* }
6+
7+
@l = common hidden local_unnamed_addr global i32 0, align 4
8+
9+
; CHECK-LABEL: 0000000000000000 test1:
10+
; CHECK-LABEL: 0000000000000018 $d.1:
11+
; CHECK-LABEL: 0000000000000020 $x.2:
12+
; CHECK-NEXT: b #16 <$x.4+0x4>
13+
; CHECK-LABEL: 000000000000002c $x.4:
14+
; CHECK-NEXT: b #4 <$x.4+0x4>
15+
; CHECK-NEXT: mov w0, wzr
16+
; CHECK-NEXT: ldr x30, [sp], #16
17+
; CHECK-NEXT: ret
18+
define hidden i32 @test1() {
19+
%1 = tail call i32 bitcast (i32 (...)* @g to i32 ()*)()
20+
%2 = icmp eq i32 %1, 0
21+
br i1 %2, label %3, label %5
22+
23+
3: ; preds = %0
24+
callbr void asm sideeffect "1: nop\0A\09.quad a\0A\09b ${1:l}\0A\09.quad ${0:c}", "i,X"(i32* null, i8* blockaddress(@test1, %7))
25+
to label %4 [label %7]
26+
27+
4: ; preds = %3
28+
br label %7
29+
30+
5: ; preds = %0
31+
%6 = tail call i32 bitcast (i32 (...)* @i to i32 ()*)()
32+
br label %7
33+
34+
7: ; preds = %3, %4, %5
35+
%8 = phi i32 [ %6, %5 ], [ 0, %4 ], [ 0, %3 ]
36+
ret i32 %8
37+
}
38+
39+
declare dso_local i32 @g(...) local_unnamed_addr
40+
41+
declare dso_local i32 @i(...) local_unnamed_addr
42+
43+
; CHECK-LABEL: 000000000000003c test2:
44+
; CHECK: bl #0 <test2+0x18>
45+
; CHECK-LABEL: 0000000000000064 $d.5:
46+
; CHECK-LABEL: 000000000000006c $x.6:
47+
; CHECK-NEXT: b #-24 <test2+0x18>
48+
define hidden i32 @test2() local_unnamed_addr {
49+
%1 = load i32, i32* @l, align 4
50+
%2 = icmp eq i32 %1, 0
51+
br i1 %2, label %10, label %3
52+
53+
3: ; preds = %0
54+
%4 = tail call i32 bitcast (i32 (...)* @g to i32 ()*)()
55+
%5 = icmp eq i32 %4, 0
56+
br i1 %5, label %6, label %7
57+
58+
6: ; preds = %3
59+
callbr void asm sideeffect "1: nop\0A\09.quad b\0A\09b ${1:l}\0A\09.quad ${0:c}", "i,X"(i32* null, i8* blockaddress(@test2, %7))
60+
to label %10 [label %9]
61+
62+
7: ; preds = %3
63+
%8 = tail call i32 bitcast (i32 (...)* @i to i32 ()*)()
64+
br label %10
65+
66+
9: ; preds = %6
67+
br label %10
68+
69+
10: ; preds = %7, %0, %6, %9
70+
ret i32 undef
71+
}
72+
73+
; CHECK-LABEL: 0000000000000084 test3:
74+
; CHECK-LABEL: 00000000000000a8 $d.9:
75+
; CHECK-LABEL: 00000000000000b0 $x.10:
76+
; CHECK-NEXT: b #20 <$x.12+0x8>
77+
; CHECK-LABEL: 00000000000000bc $x.12:
78+
; CHECK-NEXT: b #4 <$x.12+0x4>
79+
; CHECK-NEXT: mov w0, wzr
80+
; CHECK-NEXT: ldr x30, [sp], #16
81+
; CHECK-NEXT: ret
82+
define internal i1 @test3() {
83+
%1 = tail call i32 bitcast (i32 (...)* @g to i32 ()*)()
84+
%2 = icmp eq i32 %1, 0
85+
br i1 %2, label %3, label %5
86+
87+
3: ; preds = %0
88+
callbr void asm sideeffect "1: nop\0A\09.quad c\0A\09b ${1:l}\0A\09.quad ${0:c}", "i,X"(i32* null, i8* blockaddress(@test3, %8))
89+
to label %4 [label %8]
90+
91+
4: ; preds = %3
92+
br label %8
93+
94+
5: ; preds = %0
95+
%6 = tail call i32 bitcast (i32 (...)* @i to i32 ()*)()
96+
%7 = icmp ne i32 %6, 0
97+
br label %8
98+
99+
8: ; preds = %3, %4, %5
100+
%9 = phi i1 [ %7, %5 ], [ false, %4 ], [ false, %3 ]
101+
ret i1 %9
102+
}

‎llvm/test/CodeGen/X86/callbr-asm-obj-file.ll

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
; RUN: llc < %s -mtriple=x86_64-linux-gnu -filetype=obj -o - \
2+
; RUN: | llvm-objdump -triple x86_64-linux-gnu -d - \
3+
; RUN: | FileCheck %s
4+
5+
; CHECK: 0000000000000000 test1:
6+
; CHECK-NEXT: 0: 74 00 je 0 <test1+0x2>
7+
; CHECK-NEXT: 2: c3 retq
8+
9+
define void @test1() {
10+
entry:
11+
callbr void asm sideeffect "je ${0:l}", "X,~{dirflag},~{fpsr},~{flags}"(i8* blockaddress(@test1, %a.b.normal.jump))
12+
to label %asm.fallthrough [label %a.b.normal.jump]
13+
14+
asm.fallthrough:
15+
ret void
16+
17+
a.b.normal.jump:
18+
ret void
19+
}

0 commit comments

Comments
 (0)