Skip to content

Commit

Permalink
[SVE][IR] Small TypeSize improvements left out of initial commit
Browse files Browse the repository at this point in the history
The commit for D53137 left out the last round of improvements
requested by reviewers. Adding those in now.

llvm-svn: 375013
  • Loading branch information
huntergr-arm committed Oct 16, 2019
1 parent a9cfde1 commit f998fa2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion llvm/include/llvm/IR/DataLayout.h
Expand Up @@ -453,7 +453,7 @@ class DataLayout {
///
/// For example, returns 5 for i36 and 10 for x86_fp80.
TypeSize getTypeStoreSize(Type *Ty) const {
auto BaseSize = getTypeSizeInBits(Ty);
TypeSize BaseSize = getTypeSizeInBits(Ty);
return { (BaseSize.getKnownMinSize() + 7) / 8, BaseSize.isScalable() };
}

Expand Down
6 changes: 3 additions & 3 deletions llvm/include/llvm/Support/TypeSize.h
Expand Up @@ -120,7 +120,7 @@ class TypeSize {

// Return the minimum size with the assumption that the size is exact.
// Use in places where a scalable size doesn't make sense (e.g. non-vector
// types, or vectors in backends which don't support scalable vectors)
// types, or vectors in backends which don't support scalable vectors).
uint64_t getFixedSize() const {
assert(!IsScalable && "Request for a fixed size on a scalable object");
return MinSize;
Expand All @@ -141,12 +141,12 @@ class TypeSize {
// Casts to a uint64_t if this is a fixed-width size.
//
// NOTE: This interface is obsolete and will be removed in a future version
// of LLVM in favour of calling getFixedSize() directly
// of LLVM in favour of calling getFixedSize() directly.
operator uint64_t() const {
return getFixedSize();
}

// Additional convenience operators needed to avoid ambiguous parses
// Additional convenience operators needed to avoid ambiguous parses.
// TODO: Make uint64_t the default operator?
TypeSize operator*(uint64_t RHS) const {
return { MinSize * RHS, IsScalable };
Expand Down
8 changes: 4 additions & 4 deletions llvm/lib/IR/Instructions.cpp
Expand Up @@ -2983,8 +2983,8 @@ bool CastInst::isCastable(Type *SrcTy, Type *DestTy) {
}

// Get the bit sizes, we'll need these
auto SrcBits = SrcTy->getPrimitiveSizeInBits(); // 0 for ptr
auto DestBits = DestTy->getPrimitiveSizeInBits(); // 0 for ptr
TypeSize SrcBits = SrcTy->getPrimitiveSizeInBits(); // 0 for ptr
TypeSize DestBits = DestTy->getPrimitiveSizeInBits(); // 0 for ptr

// Run through the possibilities ...
if (DestTy->isIntegerTy()) { // Casting to integral
Expand Down Expand Up @@ -3045,8 +3045,8 @@ bool CastInst::isBitCastable(Type *SrcTy, Type *DestTy) {
}
}

auto SrcBits = SrcTy->getPrimitiveSizeInBits(); // 0 for ptr
auto DestBits = DestTy->getPrimitiveSizeInBits(); // 0 for ptr
TypeSize SrcBits = SrcTy->getPrimitiveSizeInBits(); // 0 for ptr
TypeSize DestBits = DestTy->getPrimitiveSizeInBits(); // 0 for ptr

// Could still have vectors of pointers if the number of elements doesn't
// match
Expand Down

0 comments on commit f998fa2

Please sign in to comment.