Skip to content

Commit

Permalink
Fix overwriting the same variable due to incorrect using
Browse files Browse the repository at this point in the history
  • Loading branch information
ParkHanbum committed Jul 21, 2024
1 parent 11baae5 commit 9a95282
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3604,7 +3604,8 @@ static Value *foldBitFieldArithmetic(BinaryOperator &I,
// BitFieldAddInfo.
auto MatchBitFieldAdd =
[&](BinaryOperator &I) -> std::optional<BitFieldAddInfo> {
const APInt *OptLoMask, *OptUpMask, *LoMask, *UpMask, *UpMask2 = nullptr;
const APInt *OptLoMask, *OptLoMask2 = nullptr, *OptUpMask, *LoMask, *UpMask,
*UpMask2 = nullptr;
Value *X, *Y, *UpY;

// Bitfield has more than 2 member.
Expand All @@ -3631,7 +3632,7 @@ static Value *foldBitFieldArithmetic(BinaryOperator &I,
m_c_Xor(m_CombineOr(
// When Y is not the constant.
m_c_Add(m_And(m_Value(X), m_APInt(OptLoMask)),
m_And(m_Value(Y), m_APInt(OptLoMask))),
m_And(m_Value(Y), m_APInt(OptLoMask2))),
// When Y is Constant, it can be accumulated.
m_c_Add(m_And(m_Value(X), m_APInt(OptLoMask)), m_Value(Y))),
// If Y is a constant, X^Y&OptUpMask can be pre-computed and
Expand Down Expand Up @@ -3662,7 +3663,8 @@ static Value *foldBitFieldArithmetic(BinaryOperator &I,
}

// Match already optimized bitfield operation.
if (match(&I, OptBitFieldAdd)) {
if (match(&I, OptBitFieldAdd) &&
(OptLoMask2 == OptLoMask || OptLoMask2 == nullptr)) {
APInt Mask = APInt::getBitsSet(
BitWidth, BitWidth - OptUpMask->countl_zero(), BitWidth);
APInt Mask2 = APInt::getBitsSet(
Expand Down

0 comments on commit 9a95282

Please sign in to comment.