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

Fixed formatting, removed bug reference, renamed testcase 

Thanks to Duncan Exon Smith for reviewing and cleanup suggestions. 

llvm-svn: 213205
This commit is contained in:
Sanjay Patel 2014-07-16 22:40:28 +00:00
parent 618ce3e85e
commit d3bbfa1cb6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/CodeGen/CodeGenPrepare.cpp
View File

@ -2036,7 +2036,8 @@ bool AddressingModeMatcher::MatchOperationAddr(User *AddrInst, unsigned Opcode,
case Instruction::Shl: { case Instruction::Shl: {
// Can only handle X*C and X << C. // Can only handle X*C and X << C.
ConstantInt *RHS = dyn_cast<ConstantInt>(AddrInst->getOperand(1)); ConstantInt *RHS = dyn_cast<ConstantInt>(AddrInst->getOperand(1));
if (!RHS) return false; if (!RHS)
return false;
int64_t Scale = RHS->getSExtValue(); int64_t Scale = RHS->getSExtValue();
if (Opcode == Instruction::Shl) if (Opcode == Instruction::Shl)
Scale = 1LL << Scale; Scale = 1LL << Scale;
@ -2130,9 +2131,9 @@ bool AddressingModeMatcher::MatchOperationAddr(User *AddrInst, unsigned Opcode,
return true; return true;
} }
case Instruction::SExt: { case Instruction::SExt: {
// Make sure this isn't a ConstantExpr (PR20314).
Instruction *SExt = dyn_cast<Instruction>(AddrInst); Instruction *SExt = dyn_cast<Instruction>(AddrInst);
if (!SExt) return false; if (!SExt)
return false;
// Try to move this sext out of the way of the addressing mode. // Try to move this sext out of the way of the addressing mode.
// Ask for a method for doing so. // Ask for a method for doing so.

4
llvm/test/CodeGen/X86/pr20314.ll → llvm/test/CodeGen/X86/address-type-promotion-constantexpr.ll
View File

@ -1,11 +1,13 @@
; RUN: llc < %s -mtriple=x86_64-pc-linux ; RUN: llc < %s -mtriple=x86_64-pc-linux
; No check as PR20314 is a crashing bug. ; PR20314 is a crashing bug. This program does nothing with the load, so just check that the return is 0.
@c = common global [2 x i32] zeroinitializer, align 4 @c = common global [2 x i32] zeroinitializer, align 4
@a = common global i32 0, align 4 @a = common global i32 0, align 4
@b = internal unnamed_addr constant [2 x i8] c"\01\00", align 1 @b = internal unnamed_addr constant [2 x i8] c"\01\00", align 1
; CHECK-LABEL: main
; CHECK: xor %eax, %eax
define i32 @main() { define i32 @main() {
entry: entry:
%foo = load i8* getelementptr ([2 x i8]* @b, i64 0, i64 sext (i8 or (i8 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32]* @c, i64 0, i64 1), i32* @a) to i8), i8 1) to i64)), align 1 %foo = load i8* getelementptr ([2 x i8]* @b, i64 0, i64 sext (i8 or (i8 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32]* @c, i64 0, i64 1), i32* @a) to i8), i8 1) to i64)), align 1