Skip to content

[Conversion] Migrate away from PointerUnion::{is,get} (NFC) #122421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2025
Merged

[Conversion] Migrate away from PointerUnion::{is,get} (NFC) #122421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da37778
[Conversion] Migrate away from PointerUnion::{is,get} (NFC)
kazutakahirata Jan 10, 2025
4fd5d27
Address a comment.
kazutakahirata Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ LogicalResult ReinterpretCastPattern::matchAndRewrite(
if (auto val = dyn_cast<Value>(offset))
return val;

int64_t attrVal = cast<IntegerAttr>(offset.get<Attribute>()).getInt();
int64_t attrVal = cast<IntegerAttr>(cast<Attribute>(offset)).getInt();
Attribute attr = rewriter.getIntegerAttr(intType, attrVal);
return rewriter.createOrFold<spirv::ConstantOp>(loc, intType, attr);
}();
Expand Down
16 changes: 8 additions & 8 deletions mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,12 @@ struct ConvertUpdateHaloOp

// convert a OpFoldResult into a Value
auto toValue = [&rewriter, &loc](OpFoldResult &v) {
return v.is<Value>()
? v.get<Value>()
return isa<Value>(v)
? cast<Value>(v)
: rewriter.create<::mlir::arith::ConstantOp>(
loc,
rewriter.getIndexAttr(
cast<IntegerAttr>(v.get<Attribute>()).getInt()));
cast<IntegerAttr>(cast<Attribute>(v)).getInt()));
};

auto dest = op.getDestination();
Expand All @@ -267,11 +267,11 @@ struct ConvertUpdateHaloOp
getMixedValues(op.getStaticHaloSizes(), op.getHaloSizes(), rewriter);
// subviews need Index values
for (auto &sz : haloSizes) {
if (sz.is<Value>()) {
sz = rewriter
.create<arith::IndexCastOp>(loc, rewriter.getIndexType(),
sz.get<Value>())
.getResult();
if (auto value = dyn_cast<Value>(sz)) {
sz =
rewriter
.create<arith::IndexCastOp>(loc, rewriter.getIndexType(), value)
.getResult();
}
}

Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static Value getAsLLVMValue(OpBuilder &builder, Location loc,
return builder.create<LLVM::ConstantOp>(loc, intAttr).getResult();
}

return foldResult.get<Value>();
return cast<Value>(foldResult);
}

namespace {
Expand Down
Loading