[llvm] r350017 - [MemoryLocation] Use LocationSize instead of ints; NFC
George Burgess IV via llvm-commits
llvm-commits at lists.llvm.org
Sat Dec 22 19:36:44 PST 2018
Author: gbiv
Date: Sat Dec 22 19:36:44 2018
New Revision: 350017
URL: http://llvm.org/viewvc/llvm-project?rev=350017&view=rev
Log:
[MemoryLocation] Use LocationSize instead of ints; NFC
Trying to keep these patches super small so they're easily post-commit
verifiable, as requested in D44748.
This one sadly isn't *super* small, but all of the changes here are
either to:
- libfuncs that are passed a constant size (memcpy, memset, ...)
- instructions that store/load a constant size
So they have to be precise
Modified:
llvm/trunk/lib/Analysis/MemoryLocation.cpp
Modified: llvm/trunk/lib/Analysis/MemoryLocation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/MemoryLocation.cpp?rev=350017&r1=350016&r2=350017&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/MemoryLocation.cpp (original)
+++ llvm/trunk/lib/Analysis/MemoryLocation.cpp Sat Dec 22 19:36:44 2018
@@ -37,8 +37,9 @@ MemoryLocation MemoryLocation::get(const
LI->getAAMetadata(AATags);
const auto &DL = LI->getModule()->getDataLayout();
- return MemoryLocation(LI->getPointerOperand(),
- DL.getTypeStoreSize(LI->getType()), AATags);
+ return MemoryLocation(
+ LI->getPointerOperand(),
+ LocationSize::precise(DL.getTypeStoreSize(LI->getType())), AATags);
}
MemoryLocation MemoryLocation::get(const StoreInst *SI) {
@@ -47,7 +48,8 @@ MemoryLocation MemoryLocation::get(const
const auto &DL = SI->getModule()->getDataLayout();
return MemoryLocation(SI->getPointerOperand(),
- DL.getTypeStoreSize(SI->getValueOperand()->getType()),
+ LocationSize::precise(DL.getTypeStoreSize(
+ SI->getValueOperand()->getType())),
AATags);
}
@@ -64,9 +66,10 @@ MemoryLocation MemoryLocation::get(const
CXI->getAAMetadata(AATags);
const auto &DL = CXI->getModule()->getDataLayout();
- return MemoryLocation(
- CXI->getPointerOperand(),
- DL.getTypeStoreSize(CXI->getCompareOperand()->getType()), AATags);
+ return MemoryLocation(CXI->getPointerOperand(),
+ LocationSize::precise(DL.getTypeStoreSize(
+ CXI->getCompareOperand()->getType())),
+ AATags);
}
MemoryLocation MemoryLocation::get(const AtomicRMWInst *RMWI) {
@@ -75,7 +78,8 @@ MemoryLocation MemoryLocation::get(const
const auto &DL = RMWI->getModule()->getDataLayout();
return MemoryLocation(RMWI->getPointerOperand(),
- DL.getTypeStoreSize(RMWI->getValOperand()->getType()),
+ LocationSize::precise(DL.getTypeStoreSize(
+ RMWI->getValOperand()->getType())),
AATags);
}
@@ -88,9 +92,9 @@ MemoryLocation MemoryLocation::getForSou
}
MemoryLocation MemoryLocation::getForSource(const AnyMemTransferInst *MTI) {
- uint64_t Size = MemoryLocation::UnknownSize;
+ auto Size = LocationSize::unknown();
if (ConstantInt *C = dyn_cast<ConstantInt>(MTI->getLength()))
- Size = C->getValue().getZExtValue();
+ Size = LocationSize::precise(C->getValue().getZExtValue());
// memcpy/memmove can have AA tags. For memcpy, they apply
// to both the source and the destination.
@@ -109,9 +113,9 @@ MemoryLocation MemoryLocation::getForDes
}
MemoryLocation MemoryLocation::getForDest(const AnyMemIntrinsic *MI) {
- uint64_t Size = MemoryLocation::UnknownSize;
+ auto Size = LocationSize::unknown();
if (ConstantInt *C = dyn_cast<ConstantInt>(MI->getLength()))
- Size = C->getValue().getZExtValue();
+ Size = LocationSize::precise(C->getValue().getZExtValue());
// memcpy/memmove can have AA tags. For memcpy, they apply
// to both the source and the destination.
@@ -141,7 +145,8 @@ MemoryLocation MemoryLocation::getForArg
assert((ArgIdx == 0 || ArgIdx == 1) &&
"Invalid argument index for memory intrinsic");
if (ConstantInt *LenCI = dyn_cast<ConstantInt>(II->getArgOperand(2)))
- return MemoryLocation(Arg, LenCI->getZExtValue(), AATags);
+ return MemoryLocation(Arg, LocationSize::precise(LenCI->getZExtValue()),
+ AATags);
break;
case Intrinsic::lifetime_start:
@@ -149,27 +154,37 @@ MemoryLocation MemoryLocation::getForArg
case Intrinsic::invariant_start:
assert(ArgIdx == 1 && "Invalid argument index");
return MemoryLocation(
- Arg, cast<ConstantInt>(II->getArgOperand(0))->getZExtValue(), AATags);
+ Arg,
+ LocationSize::precise(
+ cast<ConstantInt>(II->getArgOperand(0))->getZExtValue()),
+ AATags);
case Intrinsic::invariant_end:
// The first argument to an invariant.end is a "descriptor" type (e.g. a
// pointer to a empty struct) which is never actually dereferenced.
if (ArgIdx == 0)
- return MemoryLocation(Arg, 0, AATags);
+ return MemoryLocation(Arg, LocationSize::precise(0), AATags);
assert(ArgIdx == 2 && "Invalid argument index");
return MemoryLocation(
- Arg, cast<ConstantInt>(II->getArgOperand(1))->getZExtValue(), AATags);
+ Arg,
+ LocationSize::precise(
+ cast<ConstantInt>(II->getArgOperand(1))->getZExtValue()),
+ AATags);
case Intrinsic::arm_neon_vld1:
assert(ArgIdx == 0 && "Invalid argument index");
// LLVM's vld1 and vst1 intrinsics currently only support a single
// vector register.
- return MemoryLocation(Arg, DL.getTypeStoreSize(II->getType()), AATags);
+ return MemoryLocation(
+ Arg, LocationSize::precise(DL.getTypeStoreSize(II->getType())),
+ AATags);
case Intrinsic::arm_neon_vst1:
assert(ArgIdx == 0 && "Invalid argument index");
- return MemoryLocation(
- Arg, DL.getTypeStoreSize(II->getArgOperand(1)->getType()), AATags);
+ return MemoryLocation(Arg,
+ LocationSize::precise(DL.getTypeStoreSize(
+ II->getArgOperand(1)->getType())),
+ AATags);
}
}
@@ -184,9 +199,10 @@ MemoryLocation MemoryLocation::getForArg
assert((ArgIdx == 0 || ArgIdx == 1) &&
"Invalid argument index for memset_pattern16");
if (ArgIdx == 1)
- return MemoryLocation(Arg, 16, AATags);
+ return MemoryLocation(Arg, LocationSize::precise(16), AATags);
if (const ConstantInt *LenCI = dyn_cast<ConstantInt>(CS.getArgument(2)))
- return MemoryLocation(Arg, LenCI->getZExtValue(), AATags);
+ return MemoryLocation(Arg, LocationSize::precise(LenCI->getZExtValue()),
+ AATags);
}
// FIXME: Handle memset_pattern4 and memset_pattern8 also.
More information about the llvm-commits
mailing list