Fixed formatting, removed bug reference, renamed testcase

Thanks to Duncan Exon Smith for reviewing and cleanup suggestions.

llvm-svn: 213205

diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index f2c7e64..d5039b2 100644 (file)
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -2036,7 +2036,8 @@ bool AddressingModeMatcher::MatchOperationAddr(User *AddrInst, unsigned Opcode,
   case Instruction::Shl: {
     // Can only handle X*C and X << C.
     ConstantInt *RHS = dyn_cast<ConstantInt>(AddrInst->getOperand(1));
-    if (!RHS) return false;
+    if (!RHS)
+      return false;
     int64_t Scale = RHS->getSExtValue();
     if (Opcode == Instruction::Shl)
       Scale = 1LL << Scale;
@@ -2130,9 +2131,9 @@ bool AddressingModeMatcher::MatchOperationAddr(User *AddrInst, unsigned Opcode,
     return true;
   }
   case Instruction::SExt: {
-    // Make sure this isn't a ConstantExpr (PR20314).
     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.
     // Ask for a method for doing so.

diff --git a/llvm/test/CodeGen/X86/pr20314.ll b/llvm/test/CodeGen/X86/address-type-promotion-constantexpr.ll
similarity index 74%
rename from llvm/test/CodeGen/X86/pr20314.ll
rename to llvm/test/CodeGen/X86/address-type-promotion-constantexpr.ll
index 4448afb..32f29bd 100644 (file)
--- a/llvm/test/CodeGen/X86/pr20314.ll
+++ b/llvm/test/CodeGen/X86/address-type-promotion-constantexpr.ll
@@ -1,11 +1,13 @@
 ; 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
 @a = common global i32 0, align 4
 @b = internal unnamed_addr constant [2 x i8] c"\01\00", align 1
 
+; CHECK-LABEL: main
+; CHECK: xor %eax, %eax
 define i32 @main() {
 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