forked from OSchip/llvm-project
Revert "Use the MachineBasicBlock symbol for a callbr target"
This reverts commit r366523/ccbffefccaff42b0d094c9ef0f49fc3e8c8456ea. Two regressions were immediately reported: - https://github.com/ClangBuiltLinux/linux/issues/614 - https://github.com/ClangBuiltLinux/linux/issues/615 Reported-by: nathanchance llvm-svn: 366600
This commit is contained in:
parent
2272be94f2
commit
4e9196ebcb
|
@ -430,13 +430,8 @@ static void EmitGCCInlineAsmStr(const char *AsmStr, const MachineInstr *MI,
|
|||
if (Modifier[0] == 'l') { // Labels are target independent.
|
||||
if (MI->getOperand(OpNo).isBlockAddress()) {
|
||||
const BlockAddress *BA = MI->getOperand(OpNo).getBlockAddress();
|
||||
const BasicBlock *BB = BA->getBasicBlock();
|
||||
const MachineFunction *MF = MI->getParent()->getParent();
|
||||
for (const MachineBasicBlock &MBB : *MF)
|
||||
if (BB == MBB.getBasicBlock()) {
|
||||
MBB.getSymbol()->print(OS, AP->MAI);
|
||||
break;
|
||||
}
|
||||
MCSymbol *Sym = AP->GetBlockAddressSymbol(BA);
|
||||
Sym->print(OS, AP->MAI);
|
||||
} else if (MI->getOperand(OpNo).isMBB()) {
|
||||
const MCSymbol *Sym = MI->getOperand(OpNo).getMBB()->getSymbol();
|
||||
Sym->print(OS, AP->MAI);
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
; RUN: llc < %s -mtriple=x86_64-linux-gnu -filetype=obj -o - \
|
||||
; RUN: | llvm-objdump -triple x86_64-linux-gnu -d - \
|
||||
; RUN: | FileCheck %s
|
||||
|
||||
; CHECK: 0000000000000000 test1:
|
||||
; CHECK-NEXT: 0: 74 00 je 0 <test1+0x2>
|
||||
; CHECK-NEXT: 2: c3 retq
|
||||
|
||||
define void @test1() {
|
||||
entry:
|
||||
callbr void asm sideeffect "je ${0:l}", "X,~{dirflag},~{fpsr},~{flags}"(i8* blockaddress(@test1, %a.b.normal.jump))
|
||||
to label %asm.fallthrough [label %a.b.normal.jump]
|
||||
|
||||
asm.fallthrough:
|
||||
ret void
|
||||
|
||||
a.b.normal.jump:
|
||||
ret void
|
||||
}
|
|
@ -12,7 +12,7 @@ define i32 @test1(i32 %a) {
|
|||
; CHECK-NEXT: addl $4, %eax
|
||||
; CHECK-NEXT: #APP
|
||||
; CHECK-NEXT: xorl %eax, %eax
|
||||
; CHECK-NEXT: jmp .LBB0_2
|
||||
; CHECK-NEXT: jmp .Ltmp00
|
||||
; CHECK-NEXT: #NO_APP
|
||||
; CHECK-NEXT: .LBB0_1: # %normal
|
||||
; CHECK-NEXT: xorl %eax, %eax
|
||||
|
@ -87,17 +87,17 @@ define dso_local i32 @test3(i32 %a) {
|
|||
; CHECK-NEXT: # Parent Loop BB2_3 Depth=3
|
||||
; CHECK-NEXT: # => This Inner Loop Header: Depth=4
|
||||
; CHECK-NEXT: #APP
|
||||
; CHECK-NEXT: jmp .LBB2_1
|
||||
; CHECK-NEXT: jmp .LBB2_2
|
||||
; CHECK-NEXT: jmp .LBB2_3
|
||||
; CHECK-NEXT: jmp .Ltmp10
|
||||
; CHECK-NEXT: jmp .Ltmp20
|
||||
; CHECK-NEXT: jmp .Ltmp30
|
||||
; CHECK-NEXT: #NO_APP
|
||||
; CHECK-NEXT: .LBB2_5: # %normal0
|
||||
; CHECK-NEXT: # in Loop: Header=BB2_4 Depth=4
|
||||
; CHECK-NEXT: #APP
|
||||
; CHECK-NEXT: jmp .LBB2_1
|
||||
; CHECK-NEXT: jmp .LBB2_2
|
||||
; CHECK-NEXT: jmp .LBB2_3
|
||||
; CHECK-NEXT: jmp .LBB2_4
|
||||
; CHECK-NEXT: jmp .Ltmp10
|
||||
; CHECK-NEXT: jmp .Ltmp20
|
||||
; CHECK-NEXT: jmp .Ltmp30
|
||||
; CHECK-NEXT: jmp .Ltmp40
|
||||
; CHECK-NEXT: #NO_APP
|
||||
; CHECK-NEXT: .LBB2_6: # %normal1
|
||||
; CHECK-NEXT: movl {{[0-9]+}}(%esp), %eax
|
||||
|
|
Loading…
Reference in New Issue