Changes in directory llvm/lib/Transforms/Scalar:
InstructionCombining.cpp updated: 1.582 -> 1.583 --- Log message: simplify some more code now that there are not multiple different integer types of the same size --- Diffs of the changes: (+4 -8) InstructionCombining.cpp | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.582 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.583 --- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.582 Fri Jan 5 19:45:59 2007 +++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp Fri Jan 5 20:09:32 2007 @@ -7211,13 +7211,9 @@ // Check to see if we are changing the return type... if (OldRetTy != FT->getReturnType()) { - if (Callee->isExternal() && - !Caller->use_empty() && - !(OldRetTy->canLosslesslyBitCastTo(FT->getReturnType()) || - (isa<PointerType>(FT->getReturnType()) && - TD->getIntPtrType()->canLosslesslyBitCastTo(OldRetTy))) - ) - return false; // Cannot transform this return value... + if (Callee->isExternal() && !Caller->use_empty() && + OldRetTy != FT->getReturnType()) + return false; // Cannot transform this return value. // If the callsite is an invoke instruction, and the return value is used by // a PHI node in a successor, we cannot change the return type of the call @@ -7242,7 +7238,7 @@ const Type *ActTy = (*AI)->getType(); ConstantInt *c = dyn_cast<ConstantInt>(*AI); //Either we can cast directly, or we can upconvert the argument - bool isConvertible = ActTy->canLosslesslyBitCastTo(ParamTy) || + bool isConvertible = ActTy == ParamTy || (ParamTy->isIntegral() && ActTy->isIntegral() && ParamTy->getPrimitiveSize() >= ActTy->getPrimitiveSize()) || (c && ParamTy->getPrimitiveSize() >= ActTy->getPrimitiveSize() && _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits