maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[X86] PR27502: Fix the LEA optimization pass. 

Handle MachineBasicBlock as a memory displacement operand in the LEA optimization pass.

Differential Revision: http://reviews.llvm.org/D19409

llvm-svn: 267551
This commit is contained in:
Andrey Turetskiy 2016-04-26 12:18:12 +00:00
parent e114a1711a
commit b405606432
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Target/X86/X86OptimizeLEAs.cpp
View File

@ -146,6 +146,9 @@ template <> struct DenseMapInfo<MemOpKey> {
case MachineOperand::MO_MCSymbol:
Hash = hash_combine(Hash, Val.Disp->getMCSymbol());
break;
case MachineOperand::MO_MachineBasicBlock:
Hash = hash_combine(Hash, Val.Disp->getMBB());
break;
default:
llvm_unreachable("Invalid address displacement operand");
}
@ -185,7 +188,7 @@ static inline bool isIdenticalOp(const MachineOperand &MO1,
#ifndef NDEBUG
static bool isValidDispOp(const MachineOperand &MO) {
return MO.isImm() || MO.isCPI() || MO.isJTI() || MO.isSymbol() ||
MO.isGlobal() || MO.isBlockAddress() || MO.isMCSymbol();
MO.isGlobal() || MO.isBlockAddress() || MO.isMCSymbol() || MO.isMBB();
}
#endif
@ -203,7 +206,8 @@ static bool isSimilarDispOp(const MachineOperand &MO1,
(MO1.isBlockAddress() && MO2.isBlockAddress() &&
MO1.getBlockAddress() == MO2.getBlockAddress()) ||
(MO1.isMCSymbol() && MO2.isMCSymbol() &&
MO1.getMCSymbol() == MO2.getMCSymbol());
MO1.getMCSymbol() == MO2.getMCSymbol()) ||
(MO1.isMBB() && MO2.isMBB() && MO1.getMBB() == MO2.getMBB());
}
static inline bool isLEA(const MachineInstr &MI) {

1
llvm/test/CodeGen/X86/lea-opt-memop-check.ll → llvm/test/CodeGen/X86/lea-opt-memop-check-1.ll
View File

@ -1,4 +1,3 @@
; REQUIRES: asserts
; RUN: llc < %s -march=x86 -mtriple=i686-pc-win32 | FileCheck %s
; PR26575

21
llvm/test/CodeGen/X86/lea-opt-memop-check-2.ll Normal file
View File

@ -0,0 +1,21 @@
; RUN: llc < %s -mtriple=x86_64-pc-linux -mcpu=corei7 -relocation-model=pic | FileCheck %s
; PR27502
; UNREACHABLE: "Invalid address displacement operand"
@buf = internal global [5 x i8*] zeroinitializer
declare i32 @llvm.eh.sjlj.setjmp(i8*) nounwind
define i32 @test() nounwind optsize {
%r = tail call i32 @llvm.eh.sjlj.setjmp(i8* bitcast ([5 x i8*]* @buf to i8*))
ret i32 %r
; CHECK-LABEL: test:
; CHECK: leaq .LBB0_3(%rip), %r[[REG:[a-z]+]]
; CHECK: movq %r[[REG]], buf+8(%rip)
; CHECK: #EH_SjLj_Setup .LBB0_3
; CHECK: xorl %e[[REG]], %e[[REG]]
; CHECK: jmp .LBB0_2
; CHECK-LABEL: .LBB0_3: # Block address taken
; CHECK-LABEL: .LBB0_2:
}