Revert "Revert "Reorder MLIRContext location in BuiltinAttributes.h""
This reverts commit 511dd4f4383b1c2873beac4dbea2df302f1f9d0c along with
a couple fixes.
Original message:
Now the context is the first, rather than the last input.
This better matches the rest of the infrastructure and makes
it easier to move these types to being declaratively specified.
Phabricator: https://reviews.llvm.org/D96111
GitOrigin-RevId: c2c83e97c3ac98ddf5bd685cbfba3f620f59fa51
diff --git a/include/flang/Optimizer/Dialect/FIROps.td b/include/flang/Optimizer/Dialect/FIROps.td
index 8f3670b..cde5372 100644
--- a/include/flang/Optimizer/Dialect/FIROps.td
+++ b/include/flang/Optimizer/Dialect/FIROps.td
@@ -267,27 +267,27 @@
static constexpr llvm::StringRef inType() { return "in_type"; }
static constexpr llvm::StringRef lenpName() { return "len_param_count"; }
mlir::Type getAllocatedType();
-
+
bool hasLenParams() { return bool{(*this)->getAttr(lenpName())}; }
-
+
unsigned numLenParams() {
if (auto val = (*this)->getAttrOfType<mlir::IntegerAttr>(lenpName()))
return val.getInt();
return 0;
}
-
+
operand_range getLenParams() {
return {operand_begin(), operand_begin() + numLenParams()};
}
-
+
unsigned numShapeOperands() {
return operand_end() - operand_begin() + numLenParams();
}
-
+
operand_range getShapeOperands() {
return {operand_begin() + numLenParams(), operand_end()};
}
-
+
static mlir::Type getRefTy(mlir::Type ty);
/// Get the input type of the allocation
@@ -1131,7 +1131,7 @@
}];
let arguments = (ins AnyReferenceLike:$memref, AnyIntegerLike:$len);
-
+
let results = (outs fir_BoxCharType);
let assemblyFormat = [{
@@ -1563,7 +1563,7 @@
p.printFunctionalType((*this)->getOperandTypes(),
(*this)->getResultTypes());
}];
-
+
let verifier = [{
auto refTy = ref().getType();
if (fir::isa_ref_type(refTy)) {
@@ -1598,7 +1598,7 @@
CArg<"ArrayRef<NamedAttribute>", "{}">:$attrs)>,
OpBuilderDAG<(ins "Type":$type, "ValueRange":$operands,
CArg<"ArrayRef<NamedAttribute>", "{}">:$attrs)>];
-
+
let extraClassDeclaration = [{
static constexpr llvm::StringRef baseType() { return "base_type"; }
mlir::Type getBaseType();
@@ -1686,7 +1686,7 @@
let printer = [{
p << getOperationName() << ' '
- << (*this)->getAttrOfType<mlir::StringAttr>(fieldAttrName()).getValue()
+ << (*this)->getAttrOfType<mlir::StringAttr>(fieldAttrName()).getValue()
<< ", " << (*this)->getAttr(typeAttrName());
if (getNumOperands()) {
p << '(';
@@ -2007,7 +2007,7 @@
CArg<"ValueRange", "llvm::None">:$iterArgs,
CArg<"ArrayRef<NamedAttribute>", "{}">:$attributes)>
];
-
+
let extraClassDeclaration = [{
mlir::Block *getBody() { return ®ion().front(); }
mlir::Value getIterateVar() { return getBody()->getArgument(1); }
@@ -2276,11 +2276,11 @@
}];
let arguments = (ins FirRealAttr:$constant);
-
+
let results = (outs fir_RealType:$res);
let assemblyFormat = "`(` $constant `)` attr-dict `:` type($res)";
-
+
let verifier = [{
if (!getType().isa<fir::RealType>())
return emitOpError("must be a !fir.real type");
@@ -2357,7 +2357,7 @@
}];
let results = (outs fir_ComplexType);
-
+
let parser = [{
fir::RealAttr realp;
fir::RealAttr imagp;
@@ -2455,7 +2455,7 @@
def fir_AddrOfOp : fir_OneResultOp<"address_of", [NoSideEffect]> {
let summary = "convert a symbol to an SSA value";
-
+
let description = [{
Convert a symbol (a function or global reference) to an SSA-value to be
used in other Operations.
@@ -2474,7 +2474,7 @@
def fir_ConvertOp : fir_OneResultOp<"convert", [NoSideEffect]> {
let summary = "encapsulates all Fortran scalar type conversions";
-
+
let description = [{
Generalized type conversion. Convert the ssa value from type T to type U.
Not all pairs of types have conversions. When types T and U are the same
@@ -2705,7 +2705,7 @@
mlir::Type resultType() {
return fir::AllocaOp::wrapResultType(getType());
}
-
+
/// Return the initializer attribute if it exists, or a null attribute.
Attribute getValueOrNull() { return initVal().getValueOr(Attribute()); }
@@ -2728,9 +2728,9 @@
}
mlir::FlatSymbolRefAttr getSymbol() {
- return mlir::FlatSymbolRefAttr::get(
+ return mlir::FlatSymbolRefAttr::get(getContext(),
(*this)->getAttrOfType<mlir::StringAttr>(
- mlir::SymbolTable::getSymbolAttrName()).getValue(), getContext());
+ mlir::SymbolTable::getSymbolAttrName()).getValue());
}
}];
}
@@ -2772,7 +2772,7 @@
}];
let printer = [{
- p << getOperationName() << ' ' << (*this)->getAttr(lenParamAttrName())
+ p << getOperationName() << ' ' << (*this)->getAttr(lenParamAttrName())
<< ", " << (*this)->getAttr(intAttrName());
}];
diff --git a/lib/Lower/FIRBuilder.cpp b/lib/Lower/FIRBuilder.cpp
index 3f470d6..0a8473b 100644
--- a/lib/Lower/FIRBuilder.cpp
+++ b/lib/Lower/FIRBuilder.cpp
@@ -173,7 +173,7 @@
fir::StringLitOp Fortran::lower::FirOpBuilder::createStringLit(
mlir::Location loc, mlir::Type eleTy, llvm::StringRef data) {
- auto strAttr = mlir::StringAttr::get(data, getContext());
+ auto strAttr = mlir::StringAttr::get(getContext(), data);
auto valTag = mlir::Identifier::get(fir::StringLitOp::value(), getContext());
mlir::NamedAttribute dataAttr(valTag, strAttr);
auto sizeTag = mlir::Identifier::get(fir::StringLitOp::size(), getContext());
