Skip to content

Cherry-Pick #7567: [NFC] Address compiler warnings: C4146 - Another round of use two's complement instead of negation #8237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alsepkow wants to merge 1 commit into
base: release-1.8.2505
Choose a base branch
from
Draft

Cherry-Pick #7567: [NFC] Address compiler warnings: C4146 - Another round of use two's complement instead of negation #8237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/Analysis/BasicAliasAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,11 @@ AliasResult BasicAliasAnalysis::aliasGEP(
// stripped a gep with negative index ('gep <ptr>, -1, ...).
if (V1Size != MemoryLocation::UnknownSize &&
V2Size != MemoryLocation::UnknownSize) {
if (-(uint64_t)GEP1BaseOffset < V1Size)
// GEP1BaseOffset is negative in this else block and because we're
// assigning to an unsigned variable, we can make use of
// -I == (~I + 1) to compute the absolute value of GEP1BaseOffset.
const uint64_t GEP1BaseOffsetAbs = (~GEP1BaseOffset + 1ULL);
if (GEP1BaseOffsetAbs < V1Size)
return PartialAlias;
return NoAlias;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Analysis/ConstantFolding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static Constant *FoldBitCast(Constant *C, Type *DestTy, const DataLayout &DL) {
// Shift it to the right place, depending on endianness.
Src = ConstantExpr::getShl(Src,
ConstantInt::get(Src->getType(), ShiftAmt));
ShiftAmt += isLittleEndian ? SrcBitSize : -SrcBitSize;
ShiftAmt += isLittleEndian ? SrcBitSize : (~SrcBitSize + 1U);

// Mix it in.
Elt = ConstantExpr::getOr(Elt, Src);
Expand All @@ -213,7 +213,7 @@ static Constant *FoldBitCast(Constant *C, Type *DestTy, const DataLayout &DL) {
// endianness.
Constant *Elt = ConstantExpr::getLShr(Src,
ConstantInt::get(Src->getType(), ShiftAmt));
ShiftAmt += isLittleEndian ? DstBitSize : -DstBitSize;
ShiftAmt += isLittleEndian ? DstBitSize : (~DstBitSize + 1U);

// Truncate the element to an integer with the same pointer size and
// convert the element back to a pointer using a inttoptr.
Expand Down
8 changes: 4 additions & 4 deletions lib/Analysis/InstructionSimplify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4109,7 +4109,7 @@ Constant *FoldBitCast(Constant *C, Type *DestTy, const DataLayout &DL) {
// Shift it to the right place, depending on endianness.
Src = ConstantExpr::getShl(Src,
ConstantInt::get(Src->getType(), ShiftAmt));
ShiftAmt += isLittleEndian ? SrcBitSize : -SrcBitSize;
ShiftAmt += isLittleEndian ? SrcBitSize : (~SrcBitSize + 1U);

// Mix it in.
Elt = ConstantExpr::getOr(Elt, Src);
Expand Down Expand Up @@ -4144,9 +4144,9 @@ Constant *FoldBitCast(Constant *C, Type *DestTy, const DataLayout &DL) {
for (unsigned j = 0; j != Ratio; ++j) {
// Shift the piece of the value into the right place, depending on
// endianness.
Constant *Elt = ConstantExpr::getLShr(Src,
ConstantInt::get(Src->getType(), ShiftAmt));
ShiftAmt += isLittleEndian ? DstBitSize : -DstBitSize;
Constant *Elt = ConstantExpr::getLShr(
Src, ConstantInt::get(Src->getType(), ShiftAmt));
ShiftAmt += isLittleEndian ? DstBitSize : (~DstBitSize + 1U);

// Truncate the element to an integer with the same pointer size and
// convert the element back to a pointer using a inttoptr.
Expand Down
Loading