Skip to content

Commit 468fecf

Browse files
authored
Fix mismatches between function parameter definitions and declarations (#89512)
Addresses issue #88716. Some function parameter names in the affected header files did not match the parameter names in the definitions, or were listed in a different order. --------- Signed-off-by: Troy-Butler <[email protected]>
1 parent 1b2f970 commit 468fecf

File tree

4 files changed

+21
-24
lines changed

4 files changed

+21
-24
lines changed

clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,11 @@ class StoreManager {
225225
/// invalidated. This should include any regions explicitly invalidated
226226
/// even if they do not currently have bindings. Pass \c NULL if this
227227
/// information will not be used.
228-
virtual StoreRef invalidateRegions(Store store,
229-
ArrayRef<SVal> Values,
230-
const Expr *E, unsigned Count,
231-
const LocationContext *LCtx,
232-
const CallEvent *Call,
233-
InvalidatedSymbols &IS,
234-
RegionAndSymbolInvalidationTraits &ITraits,
235-
InvalidatedRegions *InvalidatedTopLevel,
236-
InvalidatedRegions *Invalidated) = 0;
228+
virtual StoreRef invalidateRegions(
229+
Store store, ArrayRef<SVal> Values, const Expr *Ex, unsigned Count,
230+
const LocationContext *LCtx, const CallEvent *Call,
231+
InvalidatedSymbols &IS, RegionAndSymbolInvalidationTraits &ITraits,
232+
InvalidatedRegions *TopLevelRegions, InvalidatedRegions *Invalidated) = 0;
237233

238234
/// enterStackFrame - Let the StoreManager to do something when execution
239235
/// engine is about to execute into a callee.

llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3141,20 +3141,20 @@ Value *InstCombinerImpl::getSelectCondition(Value *A, Value *B,
31413141
return nullptr;
31423142
}
31433143

3144-
/// We have an expression of the form (A & C) | (B & D). Try to simplify this
3145-
/// to "A' ? C : D", where A' is a boolean or vector of booleans.
3144+
/// We have an expression of the form (A & B) | (C & D). Try to simplify this
3145+
/// to "A' ? B : D", where A' is a boolean or vector of booleans.
31463146
/// When InvertFalseVal is set to true, we try to match the pattern
3147-
/// where we have peeked through a 'not' op and A and B are the same:
3148-
/// (A & C) | ~(A | D) --> (A & C) | (~A & ~D) --> A' ? C : ~D
3149-
Value *InstCombinerImpl::matchSelectFromAndOr(Value *A, Value *C, Value *B,
3147+
/// where we have peeked through a 'not' op and A and C are the same:
3148+
/// (A & B) | ~(A | D) --> (A & B) | (~A & ~D) --> A' ? B : ~D
3149+
Value *InstCombinerImpl::matchSelectFromAndOr(Value *A, Value *B, Value *C,
31503150
Value *D, bool InvertFalseVal) {
31513151
// The potential condition of the select may be bitcasted. In that case, look
31523152
// through its bitcast and the corresponding bitcast of the 'not' condition.
31533153
Type *OrigType = A->getType();
31543154
A = peekThroughBitcast(A, true);
3155-
B = peekThroughBitcast(B, true);
3156-
if (Value *Cond = getSelectCondition(A, B, InvertFalseVal)) {
3157-
// ((bc Cond) & C) | ((bc ~Cond) & D) --> bc (select Cond, (bc C), (bc D))
3155+
C = peekThroughBitcast(C, true);
3156+
if (Value *Cond = getSelectCondition(A, C, InvertFalseVal)) {
3157+
// ((bc Cond) & B) | ((bc ~Cond) & D) --> bc (select Cond, (bc B), (bc D))
31583158
// If this is a vector, we may need to cast to match the condition's length.
31593159
// The bitcasts will either all exist or all not exist. The builder will
31603160
// not create unnecessary casts if the types already match.
@@ -3168,11 +3168,11 @@ Value *InstCombinerImpl::matchSelectFromAndOr(Value *A, Value *C, Value *B,
31683168
Type *EltTy = Builder.getIntNTy(SelEltSize / Elts);
31693169
SelTy = VectorType::get(EltTy, VecTy->getElementCount());
31703170
}
3171-
Value *BitcastC = Builder.CreateBitCast(C, SelTy);
3171+
Value *BitcastB = Builder.CreateBitCast(B, SelTy);
31723172
if (InvertFalseVal)
31733173
D = Builder.CreateNot(D);
31743174
Value *BitcastD = Builder.CreateBitCast(D, SelTy);
3175-
Value *Select = Builder.CreateSelect(Cond, BitcastC, BitcastD);
3175+
Value *Select = Builder.CreateSelect(Cond, BitcastB, BitcastD);
31763176
return Builder.CreateBitCast(Select, OrigType);
31773177
}
31783178

llvm/lib/Transforms/Vectorize/VPlan.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3278,8 +3278,8 @@ class VPlan {
32783278
private:
32793279
/// Add to the given dominator tree the header block and every new basic block
32803280
/// that was created between it and the latch block, inclusive.
3281-
static void updateDominatorTree(DominatorTree *DT, BasicBlock *LoopLatchBB,
3282-
BasicBlock *LoopPreHeaderBB,
3281+
static void updateDominatorTree(DominatorTree *DT, BasicBlock *LoopHeaderBB,
3282+
BasicBlock *LoopLatchBB,
32833283
BasicBlock *LoopExitBB);
32843284
};
32853285

mlir/lib/Dialect/SparseTensor/Transforms/Utils/SparseTensorIterator.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,10 @@ class SparseIterator {
284284
};
285285

286286
/// Helper function to create a TensorLevel object from given `tensor`.
287-
std::unique_ptr<SparseTensorLevel> makeSparseTensorLevel(OpBuilder &builder,
288-
Location loc, Value t,
289-
unsigned tid, Level l);
287+
std::unique_ptr<SparseTensorLevel> makeSparseTensorLevel(OpBuilder &b,
288+
Location l, Value t,
289+
unsigned tid,
290+
Level lvl);
290291

291292
/// Helper function to create a simple SparseIterator object that iterate over
292293
/// the SparseTensorLevel.

0 commit comments

Comments
 (0)