Commit 0df7b631 authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge from mainline 

llvm-svn: 37298
parent 5764e55d

llvm/lib/Transforms/Scalar/InstructionCombining.cpp

+1 −2
Original line number Diff line number Diff line
@@ -389,8 +389,7 @@ static const Type *getPromotedType(const Type *Ty) { 
  if (const IntegerType* ITy = dyn_cast<IntegerType>(Ty)) {

    if (ITy->getBitWidth() < 32)

      return Type::Int32Ty;

  } else if (Ty == Type::FloatTy)

    return Type::DoubleTy;

  }

  return Ty;

}