mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-21 16:24:47 +00:00
Fix uint64_t -> unsigned VS warnings.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19381 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
d4bc564531
commit
652f3cf76f
@ -73,7 +73,7 @@ bool DSE::runOnBasicBlock(BasicBlock &BB) {
|
|||||||
unsigned Size = ~0U;
|
unsigned Size = ~0U;
|
||||||
if (!AI->isArrayAllocation() &&
|
if (!AI->isArrayAllocation() &&
|
||||||
AI->getType()->getElementType()->isSized())
|
AI->getType()->getElementType()->isSized())
|
||||||
Size = TD.getTypeSize(AI->getType()->getElementType());
|
Size = (unsigned)TD.getTypeSize(AI->getType()->getElementType());
|
||||||
KillLocs.add(AI, Size);
|
KillLocs.add(AI, Size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -106,7 +106,7 @@ bool DSE::runOnBasicBlock(BasicBlock &BB) {
|
|||||||
// the stored location is already in the tracker, then this is a dead
|
// the stored location is already in the tracker, then this is a dead
|
||||||
// store. We can just delete it here, but while we're at it, we also
|
// store. We can just delete it here, but while we're at it, we also
|
||||||
// delete any trivially dead expression chains.
|
// delete any trivially dead expression chains.
|
||||||
unsigned ValSize = TD.getTypeSize(I->getOperand(0)->getType());
|
unsigned ValSize = (unsigned)TD.getTypeSize(I->getOperand(0)->getType());
|
||||||
Value *Ptr = I->getOperand(1);
|
Value *Ptr = I->getOperand(1);
|
||||||
|
|
||||||
if (AliasSet *AS = KillLocs.getAliasSetForPointerIfExists(Ptr, ValSize))
|
if (AliasSet *AS = KillLocs.getAliasSetForPointerIfExists(Ptr, ValSize))
|
||||||
|
@ -2274,7 +2274,7 @@ Instruction *InstCombiner::visitSetCondInst(BinaryOperator &I) {
|
|||||||
|
|
||||||
if (LHSI->hasOneUse()) {
|
if (LHSI->hasOneUse()) {
|
||||||
// Otherwise strength reduce the shift into an and.
|
// Otherwise strength reduce the shift into an and.
|
||||||
unsigned ShAmtVal = ShAmt->getValue();
|
unsigned ShAmtVal = (unsigned)ShAmt->getValue();
|
||||||
unsigned TypeBits = CI->getType()->getPrimitiveSize()*8;
|
unsigned TypeBits = CI->getType()->getPrimitiveSize()*8;
|
||||||
uint64_t Val = (1ULL << (TypeBits-ShAmtVal))-1;
|
uint64_t Val = (1ULL << (TypeBits-ShAmtVal))-1;
|
||||||
|
|
||||||
@ -2317,7 +2317,7 @@ Instruction *InstCombiner::visitSetCondInst(BinaryOperator &I) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (LHSI->hasOneUse() || CI->isNullValue()) {
|
if (LHSI->hasOneUse() || CI->isNullValue()) {
|
||||||
unsigned ShAmtVal = ShAmt->getValue();
|
unsigned ShAmtVal = (unsigned)ShAmt->getValue();
|
||||||
|
|
||||||
// Otherwise strength reduce the shift into an and.
|
// Otherwise strength reduce the shift into an and.
|
||||||
uint64_t Val = ~0ULL; // All ones.
|
uint64_t Val = ~0ULL; // All ones.
|
||||||
@ -2931,8 +2931,8 @@ Instruction *InstCombiner::visitShiftInst(ShiftInst &I) {
|
|||||||
if (ShiftInst *Op0SI = dyn_cast<ShiftInst>(Op0))
|
if (ShiftInst *Op0SI = dyn_cast<ShiftInst>(Op0))
|
||||||
if (ConstantUInt *ShiftAmt1C =
|
if (ConstantUInt *ShiftAmt1C =
|
||||||
dyn_cast<ConstantUInt>(Op0SI->getOperand(1))) {
|
dyn_cast<ConstantUInt>(Op0SI->getOperand(1))) {
|
||||||
unsigned ShiftAmt1 = ShiftAmt1C->getValue();
|
unsigned ShiftAmt1 = (unsigned)ShiftAmt1C->getValue();
|
||||||
unsigned ShiftAmt2 = CUI->getValue();
|
unsigned ShiftAmt2 = (unsigned)CUI->getValue();
|
||||||
|
|
||||||
// Check for (A << c1) << c2 and (A >> c1) >> c2
|
// Check for (A << c1) << c2 and (A >> c1) >> c2
|
||||||
if (I.getOpcode() == Op0SI->getOpcode()) {
|
if (I.getOpcode() == Op0SI->getOpcode()) {
|
||||||
@ -3169,8 +3169,8 @@ Instruction *InstCombiner::visitCastInst(CastInst &CI) {
|
|||||||
const Type *AllocElTy = AI->getAllocatedType();
|
const Type *AllocElTy = AI->getAllocatedType();
|
||||||
const Type *CastElTy = PTy->getElementType();
|
const Type *CastElTy = PTy->getElementType();
|
||||||
if (AllocElTy->isSized() && CastElTy->isSized()) {
|
if (AllocElTy->isSized() && CastElTy->isSized()) {
|
||||||
unsigned AllocElTySize = TD->getTypeSize(AllocElTy);
|
uint64_t AllocElTySize = TD->getTypeSize(AllocElTy);
|
||||||
unsigned CastElTySize = TD->getTypeSize(CastElTy);
|
uint64_t CastElTySize = TD->getTypeSize(CastElTy);
|
||||||
|
|
||||||
// If the allocation is for an even multiple of the cast type size
|
// If the allocation is for an even multiple of the cast type size
|
||||||
if (CastElTySize && (AllocElTySize % CastElTySize == 0)) {
|
if (CastElTySize && (AllocElTySize % CastElTySize == 0)) {
|
||||||
@ -4190,12 +4190,13 @@ static Constant *GetGEPGlobalInitializer(Constant *C, ConstantExpr *CE) {
|
|||||||
ConstantUInt *CU = cast<ConstantUInt>(I.getOperand());
|
ConstantUInt *CU = cast<ConstantUInt>(I.getOperand());
|
||||||
assert(CU->getValue() < STy->getNumElements() &&
|
assert(CU->getValue() < STy->getNumElements() &&
|
||||||
"Struct index out of range!");
|
"Struct index out of range!");
|
||||||
|
unsigned El = (unsigned)CU->getValue();
|
||||||
if (ConstantStruct *CS = dyn_cast<ConstantStruct>(C)) {
|
if (ConstantStruct *CS = dyn_cast<ConstantStruct>(C)) {
|
||||||
C = CS->getOperand(CU->getValue());
|
C = CS->getOperand(El);
|
||||||
} else if (isa<ConstantAggregateZero>(C)) {
|
} else if (isa<ConstantAggregateZero>(C)) {
|
||||||
C = Constant::getNullValue(STy->getElementType(CU->getValue()));
|
C = Constant::getNullValue(STy->getElementType(El));
|
||||||
} else if (isa<UndefValue>(C)) {
|
} else if (isa<UndefValue>(C)) {
|
||||||
C = UndefValue::get(STy->getElementType(CU->getValue()));
|
C = UndefValue::get(STy->getElementType(El));
|
||||||
} else {
|
} else {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -4203,7 +4204,7 @@ static Constant *GetGEPGlobalInitializer(Constant *C, ConstantExpr *CE) {
|
|||||||
const ArrayType *ATy = cast<ArrayType>(*I);
|
const ArrayType *ATy = cast<ArrayType>(*I);
|
||||||
if ((uint64_t)CI->getRawValue() >= ATy->getNumElements()) return 0;
|
if ((uint64_t)CI->getRawValue() >= ATy->getNumElements()) return 0;
|
||||||
if (ConstantArray *CA = dyn_cast<ConstantArray>(C))
|
if (ConstantArray *CA = dyn_cast<ConstantArray>(C))
|
||||||
C = CA->getOperand(CI->getRawValue());
|
C = CA->getOperand((unsigned)CI->getRawValue());
|
||||||
else if (isa<ConstantAggregateZero>(C))
|
else if (isa<ConstantAggregateZero>(C))
|
||||||
C = Constant::getNullValue(ATy->getElementType());
|
C = Constant::getNullValue(ATy->getElementType());
|
||||||
else if (isa<UndefValue>(C))
|
else if (isa<UndefValue>(C))
|
||||||
|
Loading…
Reference in New Issue
Block a user