Skip to content

Commit 6c6d77f

Browse files
committed
Address feedback
1 parent 82d3280 commit 6c6d77f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

mlir/lib/Dialect/SPIRV/IR/ControlFlowOps.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ Block *SwitchOp::getSuccessorForOperands(ArrayRef<Attribute> operands) {
294294

295295
SuccessorRange targets = getTargets();
296296
if (auto value = llvm::dyn_cast_or_null<IntegerAttr>(operands.front())) {
297-
for (const auto &it : llvm::enumerate(literals->getValues<APInt>()))
298-
if (it.value() == value.getValue())
299-
return targets[it.index()];
297+
for (auto [index, literal] : llvm::enumerate(literals->getValues<APInt>()))
298+
if (literal == value.getValue())
299+
return targets[index];
300300
return getDefaultTarget();
301301
}
302302
return nullptr;

mlir/lib/Dialect/SPIRV/IR/SPIRVOpDefinition.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ printSwitchOpCases(OpAsmPrinter &p, SwitchOp op, Type selectorType,
147147
if (!literals)
148148
return;
149149

150-
for (const auto &it : llvm::enumerate(literals.getValues<APInt>())) {
150+
for (auto [index, literal] : llvm::enumerate(literals.getValues<APInt>())) {
151151
p << ',';
152152
p.printNewline();
153153
p << " ";
154-
p << it.value().getLimitedValue();
154+
p << literal.getLimitedValue();
155155
p << ": ";
156-
p.printSuccessorAndUseList(targets[it.index()], targetOperands[it.index()]);
156+
p.printSuccessorAndUseList(targets[index], targetOperands[index]);
157157
}
158158
p.printNewline();
159159
}

mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ LogicalResult Serializer::processSwitchOp(spirv::SwitchOp switchOp) {
783783
std::optional<mlir::DenseIntElementsAttr> literals = switchOp.getLiterals();
784784
BlockRange targets = switchOp.getTargets();
785785
if (literals) {
786-
for (auto [literal, target] : llvm::zip(*literals, targets)) {
786+
for (auto [literal, target] : llvm::zip_equal(*literals, targets)) {
787787
arguments.push_back(literal.getLimitedValue());
788788
uint32_t targetLabelID = getOrCreateBlockID(target);
789789
arguments.push_back(targetLabelID);

0 commit comments

Comments
 (0)