Skip to content

Commit 14f82d9

Browse files
Remove changedResults
1 parent d72b58e commit 14f82d9

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

mlir/lib/Transforms/Utils/DialectConversion.cpp

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,9 @@ class ModifyOperationRewrite : public OperationRewrite {
624624
class ReplaceOperationRewrite : public OperationRewrite {
625625
public:
626626
ReplaceOperationRewrite(ConversionPatternRewriterImpl &rewriterImpl,
627-
Operation *op, const TypeConverter *converter,
628-
bool changedResults)
627+
Operation *op, const TypeConverter *converter)
629628
: OperationRewrite(Kind::ReplaceOperation, rewriterImpl, op),
630-
converter(converter), changedResults(changedResults) {}
629+
converter(converter) {}
631630

632631
static bool classof(const IRRewrite *rewrite) {
633632
return rewrite->getKind() == Kind::ReplaceOperation;
@@ -641,15 +640,10 @@ class ReplaceOperationRewrite : public OperationRewrite {
641640

642641
const TypeConverter *getConverter() const { return converter; }
643642

644-
bool hasChangedResults() const { return changedResults; }
645-
646643
private:
647644
/// An optional type converter that can be used to materialize conversions
648645
/// between the new and old values if necessary.
649646
const TypeConverter *converter;
650-
651-
/// A boolean flag that indicates whether result types have changed or not.
652-
bool changedResults;
653647
};
654648

655649
class CreateOperationRewrite : public OperationRewrite {
@@ -1377,17 +1371,13 @@ void ConversionPatternRewriterImpl::notifyOpReplaced(Operation *op,
13771371
assert(newValues.size() == op->getNumResults());
13781372
assert(!ignoredOps.contains(op) && "operation was already replaced");
13791373

1380-
// Track if any of the results changed, e.g. erased and replaced with null.
1381-
bool resultChanged = false;
1382-
13831374
// Create mappings for each of the new result values.
13841375
for (auto [newValue, result] : llvm::zip(newValues, op->getResults())) {
13851376
if (!newValue) {
13861377
// This result was dropped and no replacement value was provided.
13871378
if (unresolvedMaterializations.contains(op)) {
13881379
// Do not create another materializations if we are erasing a
13891380
// materialization.
1390-
resultChanged = true;
13911381
continue;
13921382
}
13931383

@@ -1400,11 +1390,9 @@ void ConversionPatternRewriterImpl::notifyOpReplaced(Operation *op,
14001390

14011391
// Remap, and check for any result type changes.
14021392
mapping.map(result, newValue);
1403-
resultChanged |= (newValue.getType() != result.getType());
14041393
}
14051394

1406-
appendRewrite<ReplaceOperationRewrite>(op, currentTypeConverter,
1407-
resultChanged);
1395+
appendRewrite<ReplaceOperationRewrite>(op, currentTypeConverter);
14081396

14091397
// Mark this operation and all nested ops as replaced.
14101398
op->walk([&](Operation *op) { replacedOps.insert(op); });
@@ -2507,7 +2495,7 @@ LogicalResult OperationConverter::legalizeConvertedOpResultTypes(
25072495
for (unsigned i = 0; i < rewriterImpl.rewrites.size(); ++i) {
25082496
auto *opReplacement =
25092497
dyn_cast<ReplaceOperationRewrite>(rewriterImpl.rewrites[i].get());
2510-
if (!opReplacement || !opReplacement->hasChangedResults())
2498+
if (!opReplacement)
25112499
continue;
25122500
Operation *op = opReplacement->getOperation();
25132501
for (OpResult result : op->getResults()) {

0 commit comments

Comments
 (0)