Skip to content

Commit 129ec84

Browse files
[Conversion] Migrate away from PointerUnion::{is,get} (NFC) (#122421)
Note that PointerUnion::{is,get} have been soft deprecated in PointerUnion.h: // FIXME: Replace the uses of is(), get() and dyn_cast() with // isa<T>, cast<T> and the llvm::dyn_cast<T> I'm not touching PointerUnion::dyn_cast for now because it's a bit complicated; we could blindly migrate it to dyn_cast_if_present, but we should probably use dyn_cast when the operand is known to be non-null.
1 parent 25b90c4 commit 129ec84

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ LogicalResult ReinterpretCastPattern::matchAndRewrite(
911911
if (auto val = dyn_cast<Value>(offset))
912912
return val;
913913

914-
int64_t attrVal = cast<IntegerAttr>(offset.get<Attribute>()).getInt();
914+
int64_t attrVal = cast<IntegerAttr>(cast<Attribute>(offset)).getInt();
915915
Attribute attr = rewriter.getIntegerAttr(intType, attrVal);
916916
return rewriter.createOrFold<spirv::ConstantOp>(loc, intType, attr);
917917
}();

mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,12 @@ struct ConvertUpdateHaloOp
240240
auto loc = op.getLoc();
241241

242242
// convert a OpFoldResult into a Value
243-
auto toValue = [&rewriter, &loc](OpFoldResult &v) {
244-
return v.is<Value>()
245-
? v.get<Value>()
246-
: rewriter.create<::mlir::arith::ConstantOp>(
247-
loc,
248-
rewriter.getIndexAttr(
249-
cast<IntegerAttr>(v.get<Attribute>()).getInt()));
243+
auto toValue = [&rewriter, &loc](OpFoldResult &v) -> Value {
244+
if (auto value = dyn_cast<Value>(v))
245+
return value;
246+
return rewriter.create<::mlir::arith::ConstantOp>(
247+
loc, rewriter.getIndexAttr(
248+
cast<IntegerAttr>(cast<Attribute>(v)).getInt()));
250249
};
251250

252251
auto dest = op.getDestination();
@@ -267,11 +266,11 @@ struct ConvertUpdateHaloOp
267266
getMixedValues(op.getStaticHaloSizes(), op.getHaloSizes(), rewriter);
268267
// subviews need Index values
269268
for (auto &sz : haloSizes) {
270-
if (sz.is<Value>()) {
271-
sz = rewriter
272-
.create<arith::IndexCastOp>(loc, rewriter.getIndexType(),
273-
sz.get<Value>())
274-
.getResult();
269+
if (auto value = dyn_cast<Value>(sz)) {
270+
sz =
271+
rewriter
272+
.create<arith::IndexCastOp>(loc, rewriter.getIndexType(), value)
273+
.getResult();
275274
}
276275
}
277276

mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static Value getAsLLVMValue(OpBuilder &builder, Location loc,
124124
return builder.create<LLVM::ConstantOp>(loc, intAttr).getResult();
125125
}
126126

127-
return foldResult.get<Value>();
127+
return cast<Value>(foldResult);
128128
}
129129

130130
namespace {

0 commit comments

Comments
 (0)