@@ -227,7 +227,7 @@ ConversionValueMapping::lookupOrDefault(Value from,
227
227
ValueVector current{from};
228
228
do {
229
229
// Store the current value if the types match.
230
- if (TypeRange (current) == desiredTypes)
230
+ if (TypeRange (ValueRange ( current) ) == desiredTypes)
231
231
desiredValue = current;
232
232
233
233
// If possible, Replace each value with (one or multiple) mapped values.
@@ -271,9 +271,8 @@ ConversionValueMapping::lookupOrDefault(Value from,
271
271
ValueVector ConversionValueMapping::lookupOrNull (Value from,
272
272
TypeRange desiredTypes) const {
273
273
ValueVector result = lookupOrDefault (from, desiredTypes);
274
- TypeRange resultTypes (result);
275
274
if (result == ValueVector{from} ||
276
- (!desiredTypes.empty () && resultTypes != desiredTypes))
275
+ (!desiredTypes.empty () && TypeRange ( ValueRange (result)) != desiredTypes))
277
276
return {};
278
277
return result;
279
278
}
@@ -1291,7 +1290,7 @@ LogicalResult ConversionPatternRewriterImpl::remapValues(
1291
1290
}
1292
1291
1293
1292
ValueVector repl = mapping.lookupOrDefault (operand, legalTypes);
1294
- if (!repl.empty () && TypeRange (repl) == legalTypes) {
1293
+ if (!repl.empty () && TypeRange (ValueRange ( repl) ) == legalTypes) {
1295
1294
// Mapped values have the correct type or there is an existing
1296
1295
// materialization. Or the operand is not mapped at all and has the
1297
1296
// correct type.
0 commit comments