Skip to content

Replace deprecated llvm::Optional methods #241

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace deprecated llvm::Optional methods #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions sair_base.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,20 +406,20 @@ def SairOpInterface : OpInterface<"SairOp"> {
"int", "NumInstances", (ins), [{}], [{
llvm::Optional<mlir::ArrayAttr> instances = $_op.getInstances();
if (!instances.has_value()) return 0;
return instances.getValue().size();
return instances->size();
}]>,
InterfaceMethod<
"Returns lowering decisions for all instances as an array attribute",
"mlir::ArrayAttr", "GetAllDecisions", (ins), [{}], [{
llvm::Optional<mlir::ArrayAttr> instances = $_op.getInstances();
if (!instances) return mlir::ArrayAttr();
return instances.getValue();
return *instances;
}]
>,
InterfaceMethod<
"Returns lowering decisions for the given operation instance",
"DecisionsAttr", "GetDecisions", (ins "int":$instance), [{}], [{
mlir::ArrayAttr instances = $_op.getInstances().getValue();
mlir::ArrayAttr instances = *$_op.getInstances();
return instances.getValue()[instance].cast<DecisionsAttr>();
}]
>,
Expand All @@ -428,7 +428,7 @@ def SairOpInterface : OpInterface<"SairOp"> {
"void", "SetDecisions", (ins "int":$instance, "DecisionsAttr":$value),
[{}], [{
auto instances = llvm::to_vector<4>(
$_op.getInstances().getValue().getValue());
$_op.getInstances()->getValue());
instances[instance] = value;
$_op.setInstancesAttr(mlir::ArrayAttr::get($_op.getContext(), instances));
}]
Expand All @@ -440,7 +440,7 @@ def SairOpInterface : OpInterface<"SairOp"> {
llvm::SmallVector<mlir::Attribute> instances;
if ($_op.getInstances().has_value()) {
instances = llvm::to_vector<4>(
$_op.getInstances().getValue().getValue());
$_op.getInstances()->getValue());
}
instances.push_back(value);
$_op.setInstancesAttr(mlir::ArrayAttr::get($_op.getContext(), instances));
Expand Down Expand Up @@ -520,7 +520,7 @@ def SairValueProducerOp : OpInterface<"ValueProducerOp"> {
"Set decisions for the given copy of the given result.",
"void", "SetCopy",
(ins "int":$result, "int":$copy, "DecisionsAttr":$decisions), [{}], [{
auto all_copies = llvm::to_vector<4>($_op.getCopies().getValue());
auto all_copies = llvm::to_vector<4>(*$_op.getCopies());
auto result_copies_attr = all_copies[result].template cast<mlir::ArrayAttr>();
auto result_copies = llvm::to_vector<4>(result_copies_attr.getValue());

Expand Down