diff options
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/ExprTypeConvert.cpp | 16 | ||||
| -rw-r--r-- | lib/Transforms/TransformInternals.cpp | 22 | ||||
| -rw-r--r-- | lib/Transforms/TransformInternals.h | 6 |
3 files changed, 22 insertions, 22 deletions
diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp index ab4edf3366..08ebc03fb5 100644 --- a/lib/Transforms/ExprTypeConvert.cpp +++ b/lib/Transforms/ExprTypeConvert.cpp @@ -53,13 +53,13 @@ static bool MallocConvertableToType(MallocInst *MI, const Type *Ty, if (!Expr.Offset && !Expr.Scale && OldTypeSize == 1) return false; // Get the offset and scale of the allocation... - int OffsetVal = Expr.Offset ? getConstantValue(Expr.Offset) : 0; - int ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) : (Expr.Var ? 1 : 0); + int64_t OffsetVal = Expr.Offset ? getConstantValue(Expr.Offset) : 0; + int64_t ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) :(Expr.Var != 0); // The old type might not be of unit size, take old size into consideration // here... - int Offset = OffsetVal * OldTypeSize; - int Scale = ScaleVal * OldTypeSize; + int64_t Offset = OffsetVal * OldTypeSize; + int64_t Scale = ScaleVal * OldTypeSize; // In order to be successful, both the scale and the offset must be a multiple // of the requested data type's size. @@ -87,13 +87,13 @@ static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty, unsigned OldTypeSize = TD.getTypeSize(MI->getType()->getElementType()); // Get the offset and scale coefficients that we are allocating... - int OffsetVal = (Expr.Offset ? getConstantValue(Expr.Offset) : 0); - int ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) : (Expr.Var ? 1 : 0); + int64_t OffsetVal = (Expr.Offset ? getConstantValue(Expr.Offset) : 0); + int64_t ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) : (Expr.Var !=0); // The old type might not be of unit size, take old size into consideration // here... - unsigned Offset = (unsigned)OffsetVal * OldTypeSize / DataSize; - unsigned Scale = (unsigned)ScaleVal * OldTypeSize / DataSize; + unsigned Offset = (uint64_t)OffsetVal * OldTypeSize / DataSize; + unsigned Scale = (uint64_t)ScaleVal * OldTypeSize / DataSize; // Locate the malloc instruction, because we may be inserting instructions It = MI; diff --git a/lib/Transforms/TransformInternals.cpp b/lib/Transforms/TransformInternals.cpp index 8586832076..3e334eb5eb 100644 --- a/lib/Transforms/TransformInternals.cpp +++ b/lib/Transforms/TransformInternals.cpp @@ -18,7 +18,7 @@ const TargetData TD("LevelRaise: Should be GCC though!"); -static const Type *getStructOffsetStep(const StructType *STy, unsigned &Offset, +static const Type *getStructOffsetStep(const StructType *STy, uint64_t &Offset, std::vector<Value*> &Indices) { assert(Offset < TD.getTypeSize(STy) && "Offset not in composite!"); const StructLayout *SL = TD.getStructLayout(STy); @@ -56,7 +56,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, if (Offset == 0 && StopEarly && !Indices.empty()) return Ty; // Return the leaf type - unsigned ThisOffset; + uint64_t ThisOffset; const Type *NextType; if (const StructType *STy = dyn_cast<StructType>(Ty)) { ThisOffset = Offset; @@ -99,8 +99,8 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, // Get the offset and scale values if they exists... // A scale of zero with Expr.Var != 0 means a scale of 1. // - int Offset = Expr.Offset ? getConstantValue(Expr.Offset) : 0; - int Scale = Expr.Scale ? getConstantValue(Expr.Scale) : 0; + int64_t Offset = Expr.Offset ? getConstantValue(Expr.Offset) : 0; + int64_t Scale = Expr.Scale ? getConstantValue(Expr.Scale) : 0; if (Expr.Var && Scale == 0) Scale = 1; // Scale != 0 if Expr.Var != 0 @@ -115,7 +115,7 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, if (const StructType *StructTy = dyn_cast<StructType>(CompTy)) { // Step into the appropriate element of the structure... - unsigned ActualOffset = (Offset < 0) ? 0 : (unsigned)Offset; + uint64_t ActualOffset = (Offset < 0) ? 0 : (uint64_t)Offset; NextTy = getStructOffsetStep(StructTy, ActualOffset, Indices); Offset -= ActualOffset; } else { @@ -123,7 +123,7 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, if (!ElTy->isSized()) return 0; // Type is unreasonable... escape! unsigned ElSize = TD.getTypeSize(ElTy); - int ElSizeS = (int)ElSize; + int64_t ElSizeS = ElSize; // See if the user is indexing into a different cell of this array... if (Scale && (Scale >= ElSizeS || -Scale >= ElSizeS)) { @@ -131,12 +131,12 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, // array by one. In this case, we will have to insert math to munge // the index. // - int ScaleAmt = Scale/ElSizeS; + int64_t ScaleAmt = Scale/ElSizeS; if (Scale-ScaleAmt*ElSizeS) return 0; // Didn't scale by a multiple of element size, bail out Scale = 0; // Scale is consumed - int Index = Offset/ElSize; // is zero unless Offset > ElSize + int64_t Index = Offset/ElSize; // is zero unless Offset > ElSize Offset -= Index*ElSize; // Consume part of the offset if (BI) { // Generate code? @@ -165,11 +165,11 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, Indices.push_back(Expr.Var); Expr.Var = 0; - } else if (Offset >= (int)ElSize || -Offset >= (int)ElSize) { + } else if (Offset >= (int64_t)ElSize || -Offset >= (int64_t)ElSize) { // Calculate the index that we are entering into the array cell with - unsigned Index = Offset/ElSize; + uint64_t Index = Offset/ElSize; Indices.push_back(ConstantSInt::get(Type::LongTy, Index)); - Offset -= (int)(Index*ElSize); // Consume part of the offset + Offset -= (int64_t)(Index*ElSize); // Consume part of the offset } else if (isa<ArrayType>(CompTy) || Indices.empty()) { // Must be indexing a small amount into the first cell of the array diff --git a/lib/Transforms/TransformInternals.h b/lib/Transforms/TransformInternals.h index 7a2dbf1b69..867dd5d4ab 100644 --- a/lib/Transforms/TransformInternals.h +++ b/lib/Transforms/TransformInternals.h @@ -23,10 +23,10 @@ // extern const TargetData TD; -static inline int getConstantValue(const ConstantInt *CPI) { +static inline int64_t getConstantValue(const ConstantInt *CPI) { if (const ConstantSInt *CSI = dyn_cast<ConstantSInt>(CPI)) - return (int)CSI->getValue(); - return (int)cast<ConstantUInt>(CPI)->getValue(); + return CSI->getValue(); + return (int64_t)cast<ConstantUInt>(CPI)->getValue(); } |