From e7ca042730a233591cece04f177209923e6fb478 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Mon, 8 Jan 2007 01:26:33 +0000 Subject: [PATCH] Convert uses of getPrimitiveSize that should be getPrimitiveSizeInBits. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33003 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/ConstantRange.cpp | 17 ++++++++--------- lib/Analysis/ScalarEvolution.cpp | 12 ++++++------ lib/Support/ConstantRange.cpp | 17 ++++++++--------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/lib/Analysis/ConstantRange.cpp b/lib/Analysis/ConstantRange.cpp index 69d85c2e38e..33a67022593 100644 --- a/lib/Analysis/ConstantRange.cpp +++ b/lib/Analysis/ConstantRange.cpp @@ -36,7 +36,7 @@ static ConstantIntegral *getMaxValue(const Type *Ty, bool isSigned = false) { if (Ty->isInteger()) { if (isSigned) { // Calculate 011111111111111... - unsigned TypeBits = Ty->getPrimitiveSize()*8; + unsigned TypeBits = Ty->getPrimitiveSizeInBits(); int64_t Val = INT64_MAX; // All ones Val >>= 64-TypeBits; // Shift out unwanted 1 bits... return ConstantInt::get(Ty, Val); @@ -53,7 +53,7 @@ static ConstantIntegral *getMinValue(const Type *Ty, bool isSigned = false) { if (Ty->isInteger()) { if (isSigned) { // Calculate 1111111111000000000000 - unsigned TypeBits = Ty->getPrimitiveSize()*8; + unsigned TypeBits = Ty->getPrimitiveSizeInBits(); int64_t Val = -1; // All ones Val <<= TypeBits-1; // Shift over to the right spot return ConstantInt::get(Ty, Val); @@ -334,13 +334,12 @@ ConstantRange ConstantRange::unionWith(const ConstantRange &CR, /// correspond to the possible range of values as if the source range had been /// zero extended. ConstantRange ConstantRange::zeroExtend(const Type *Ty) const { - assert(getLower()->getType()->getPrimitiveSize() < Ty->getPrimitiveSize() && - "Not a value extension"); + unsigned SrcTySize = getLower()->getType()->getPrimitiveSizeInBits(); + assert(SrcTySize < Ty->getPrimitiveSizeInBits() && "Not a value extension"); if (isFullSet()) { // Change a source full set into [0, 1 << 8*numbytes) - unsigned SrcTySize = getLower()->getType()->getPrimitiveSize(); return ConstantRange(Constant::getNullValue(Ty), - ConstantInt::get(Ty, 1ULL << SrcTySize*8)); + ConstantInt::get(Ty, 1ULL << SrcTySize)); } Constant *Lower = getLower(); @@ -355,9 +354,9 @@ ConstantRange ConstantRange::zeroExtend(const Type *Ty) const { /// correspond to the possible range of values as if the source range had been /// truncated to the specified type. ConstantRange ConstantRange::truncate(const Type *Ty) const { - assert(getLower()->getType()->getPrimitiveSize() > Ty->getPrimitiveSize() && - "Not a value truncation"); - uint64_t Size = 1ULL << Ty->getPrimitiveSize()*8; + unsigned SrcTySize = getLower()->getType()->getPrimitiveSizeInBits(); + assert(SrcTySize > Ty->getPrimitiveSize() && "Not a value truncation"); + uint64_t Size = 1ULL << Ty->getPrimitiveSizeInBits(); if (isFullSet() || getSetSize() >= Size) return ConstantRange(getType()); diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index cc483b8d137..55036a45c50 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -196,8 +196,8 @@ SCEVTruncateExpr::SCEVTruncateExpr(const SCEVHandle &op, const Type *ty) : SCEV(scTruncate), Op(op), Ty(ty) { assert(Op->getType()->isInteger() && Ty->isInteger() && "Cannot truncate non-integer value!"); - assert(Op->getType()->getPrimitiveSize() > Ty->getPrimitiveSize() && - "This is not a truncating conversion!"); + assert(Op->getType()->getPrimitiveSizeInBits() > Ty->getPrimitiveSizeInBits() + && "This is not a truncating conversion!"); } SCEVTruncateExpr::~SCEVTruncateExpr() { @@ -222,8 +222,8 @@ SCEVZeroExtendExpr::SCEVZeroExtendExpr(const SCEVHandle &op, const Type *ty) : SCEV(scZeroExtend), Op(op), Ty(ty) { assert(Op->getType()->isInteger() && Ty->isInteger() && "Cannot zero extend non-integer value!"); - assert(Op->getType()->getPrimitiveSize() < Ty->getPrimitiveSize() && - "This is not an extending conversion!"); + assert(Op->getType()->getPrimitiveSizeInBits() < Ty->getPrimitiveSizeInBits() + && "This is not an extending conversion!"); } SCEVZeroExtendExpr::~SCEVZeroExtendExpr() { @@ -461,9 +461,9 @@ static SCEVHandle getTruncateOrZeroExtend(const SCEVHandle &V, const Type *Ty) { const Type *SrcTy = V->getType(); assert(SrcTy->isInteger() && Ty->isInteger() && "Cannot truncate or zero extend with non-integer arguments!"); - if (SrcTy->getPrimitiveSize() == Ty->getPrimitiveSize()) + if (SrcTy->getPrimitiveSizeInBits() == Ty->getPrimitiveSizeInBits()) return V; // No conversion - if (SrcTy->getPrimitiveSize() > Ty->getPrimitiveSize()) + if (SrcTy->getPrimitiveSizeInBits() > Ty->getPrimitiveSizeInBits()) return SCEVTruncateExpr::get(V, Ty); return SCEVZeroExtendExpr::get(V, Ty); } diff --git a/lib/Support/ConstantRange.cpp b/lib/Support/ConstantRange.cpp index 69d85c2e38e..33a67022593 100644 --- a/lib/Support/ConstantRange.cpp +++ b/lib/Support/ConstantRange.cpp @@ -36,7 +36,7 @@ static ConstantIntegral *getMaxValue(const Type *Ty, bool isSigned = false) { if (Ty->isInteger()) { if (isSigned) { // Calculate 011111111111111... - unsigned TypeBits = Ty->getPrimitiveSize()*8; + unsigned TypeBits = Ty->getPrimitiveSizeInBits(); int64_t Val = INT64_MAX; // All ones Val >>= 64-TypeBits; // Shift out unwanted 1 bits... return ConstantInt::get(Ty, Val); @@ -53,7 +53,7 @@ static ConstantIntegral *getMinValue(const Type *Ty, bool isSigned = false) { if (Ty->isInteger()) { if (isSigned) { // Calculate 1111111111000000000000 - unsigned TypeBits = Ty->getPrimitiveSize()*8; + unsigned TypeBits = Ty->getPrimitiveSizeInBits(); int64_t Val = -1; // All ones Val <<= TypeBits-1; // Shift over to the right spot return ConstantInt::get(Ty, Val); @@ -334,13 +334,12 @@ ConstantRange ConstantRange::unionWith(const ConstantRange &CR, /// correspond to the possible range of values as if the source range had been /// zero extended. ConstantRange ConstantRange::zeroExtend(const Type *Ty) const { - assert(getLower()->getType()->getPrimitiveSize() < Ty->getPrimitiveSize() && - "Not a value extension"); + unsigned SrcTySize = getLower()->getType()->getPrimitiveSizeInBits(); + assert(SrcTySize < Ty->getPrimitiveSizeInBits() && "Not a value extension"); if (isFullSet()) { // Change a source full set into [0, 1 << 8*numbytes) - unsigned SrcTySize = getLower()->getType()->getPrimitiveSize(); return ConstantRange(Constant::getNullValue(Ty), - ConstantInt::get(Ty, 1ULL << SrcTySize*8)); + ConstantInt::get(Ty, 1ULL << SrcTySize)); } Constant *Lower = getLower(); @@ -355,9 +354,9 @@ ConstantRange ConstantRange::zeroExtend(const Type *Ty) const { /// correspond to the possible range of values as if the source range had been /// truncated to the specified type. ConstantRange ConstantRange::truncate(const Type *Ty) const { - assert(getLower()->getType()->getPrimitiveSize() > Ty->getPrimitiveSize() && - "Not a value truncation"); - uint64_t Size = 1ULL << Ty->getPrimitiveSize()*8; + unsigned SrcTySize = getLower()->getType()->getPrimitiveSizeInBits(); + assert(SrcTySize > Ty->getPrimitiveSize() && "Not a value truncation"); + uint64_t Size = 1ULL << Ty->getPrimitiveSizeInBits(); if (isFullSet() || getSetSize() >= Size) return ConstantRange(getType()); -- 2.34.1