[flang-commits] [flang] 092601d - [flang] Remove 'using namespace mlir; ` from header files
Andrzej Warzynski via flang-commits
flang-commits at lists.llvm.org
Wed Mar 9 02:20:00 PST 2022
Author: Andrzej Warzynski
Date: 2022-03-09T10:19:51Z
New Revision: 092601d4baab7c13c06b31eda2d5bed91d9a6b65
URL: https://github.com/llvm/llvm-project/commit/092601d4baab7c13c06b31eda2d5bed91d9a6b65
DIFF: https://github.com/llvm/llvm-project/commit/092601d4baab7c13c06b31eda2d5bed91d9a6b65.diff
LOG: [flang] Remove 'using namespace mlir;` from header files
Currently, CGOps.h and FIROps.h contain `using namespace mlir;`. Every
file that includes one of these header files (directly and transitively)
will have the MLIR namespace enabled. With name-clashes within
sub-projects (LLVM and MLIR, MLIR and Flang), this is not desired. Also,
it is not possible to "un-use" a namespace once it is "used". Instead,
we should try to limit `using namespace` to implementation files (i.e.
*.cpp).
This patch removes `using namespace mlir;` from header files and adjusts
other files accordingly. In header and TableGen files, extra namespace
qualifier is added when referring to symbols defined in MLIR. Similar
approach is adopted in source files that didn't require many changes. In
files that would require a lot of changes, `using namespace mlir;` is
added instead.
Differential Revision: https://reviews.llvm.org/D120897
Added:
Modified:
flang/include/flang/Optimizer/Builder/Factory.h
flang/include/flang/Optimizer/Dialect/CanonicalizationPatterns.td
flang/include/flang/Optimizer/Dialect/FIROps.h
flang/include/flang/Optimizer/Dialect/FIROps.td
flang/include/flang/Optimizer/Dialect/FIROpsSupport.h
flang/lib/Lower/Bridge.cpp
flang/lib/Lower/CallInterface.cpp
flang/lib/Lower/IO.cpp
flang/lib/Lower/OpenACC.cpp
flang/lib/Lower/OpenMP.cpp
flang/lib/Optimizer/Builder/Character.cpp
flang/lib/Optimizer/Builder/DoLoopHelper.cpp
flang/lib/Optimizer/Builder/FIRBuilder.cpp
flang/lib/Optimizer/Builder/MutableBox.cpp
flang/lib/Optimizer/CodeGen/CGOps.h
flang/lib/Optimizer/CodeGen/CodeGen.cpp
flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
flang/lib/Optimizer/Dialect/FIRDialect.cpp
flang/lib/Optimizer/Dialect/FIROps.cpp
flang/lib/Optimizer/Transforms/AffineDemotion.cpp
flang/lib/Optimizer/Transforms/AffinePromotion.cpp
flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp
flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp
flang/lib/Optimizer/Transforms/RewriteLoop.cpp
flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp
flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp
flang/unittests/Optimizer/Builder/Runtime/CharacterTest.cpp
flang/unittests/Optimizer/Builder/Runtime/NumericTest.cpp
flang/unittests/Optimizer/Builder/Runtime/ReductionTest.cpp
Removed:
################################################################################
diff --git a/flang/include/flang/Optimizer/Builder/Factory.h b/flang/include/flang/Optimizer/Builder/Factory.h
index f8337d2a47e59..486ec6f1af2d4 100644
--- a/flang/include/flang/Optimizer/Builder/Factory.h
+++ b/flang/include/flang/Optimizer/Builder/Factory.h
@@ -193,12 +193,12 @@ originateIndices(mlir::Location loc, B &builder, mlir::Type memTy,
dimension == mlir::cast<fir::ShapeOp>(shapeVal.getDefiningOp())
.getType()
.getRank());
- auto one = builder.template create<arith::ConstantIndexOp>(loc, 1);
+ auto one = builder.template create<mlir::arith::ConstantIndexOp>(loc, 1);
for (auto i : llvm::enumerate(indices)) {
if (i.index() < dimension) {
assert(fir::isa_integer(i.value().getType()));
result.push_back(
- builder.template create<arith::AddIOp>(loc, i.value(), one));
+ builder.template create<mlir::arith::AddIOp>(loc, i.value(), one));
} else {
result.push_back(i.value());
}
@@ -209,7 +209,7 @@ originateIndices(mlir::Location loc, B &builder, mlir::Type memTy,
unsigned origOff = 0;
for (auto i : llvm::enumerate(indices)) {
if (i.index() < dimension)
- result.push_back(builder.template create<arith::AddIOp>(
+ result.push_back(builder.template create<mlir::arith::AddIOp>(
loc, i.value(), origins[origOff++]));
else
result.push_back(i.value());
diff --git a/flang/include/flang/Optimizer/Dialect/CanonicalizationPatterns.td b/flang/include/flang/Optimizer/Dialect/CanonicalizationPatterns.td
index 8760c6a7c24cc..b51748f91d928 100644
--- a/flang/include/flang/Optimizer/Dialect/CanonicalizationPatterns.td
+++ b/flang/include/flang/Optimizer/Dialect/CanonicalizationPatterns.td
@@ -48,7 +48,7 @@ def CombineConvertOptPattern
def createConstantOp
: NativeCodeCall<"$_builder.create<mlir::arith::ConstantOp>"
"($_loc, $_builder.getIndexType(), "
- "rewriter.getIndexAttr($1.dyn_cast<IntegerAttr>()"
+ "rewriter.getIndexAttr($1.dyn_cast<mlir::IntegerAttr>()"
".getInt()))">;
def ForwardConstantConvertPattern
diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.h b/flang/include/flang/Optimizer/Dialect/FIROps.h
index a78c853149c86..8858976e9f41f 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROps.h
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.h
@@ -15,8 +15,6 @@
#include "mlir/Interfaces/LoopLikeInterface.h"
#include "mlir/Interfaces/SideEffectInterfaces.h"
-using namespace mlir;
-
namespace fir {
class FirEndOp;
diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td
index 8f2d6d48230a3..1fccd3b5620c1 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROps.td
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.td
@@ -2064,7 +2064,7 @@ def fir_LenParamIndexOp : fir_OneResultOp<"len_param_index", [NoSideEffect]> {
"mlir::Type":$recTy),
[{
$_state.addAttribute(fieldAttrName(), $_builder.getStringAttr(fieldName));
- $_state.addAttribute(typeAttrName(), TypeAttr::get(recTy));
+ $_state.addAttribute(typeAttrName(), mlir::TypeAttr::get(recTy));
}]
>];
@@ -2154,7 +2154,7 @@ def fir_DoLoopOp : region_Op<"do_loop",
let extraClassDeclaration = [{
mlir::Value getInductionVar() { return getBody()->getArgument(0); }
mlir::OpBuilder getBodyBuilder() {
- return OpBuilder(getBody(), std::prev(getBody()->end()));
+ return mlir::OpBuilder(getBody(), std::prev(getBody()->end()));
}
mlir::Block::BlockArgListType getRegionIterArgs() {
return getBody()->getArguments().drop_front();
@@ -2163,9 +2163,9 @@ def fir_DoLoopOp : region_Op<"do_loop",
return getOperands().drop_front(getNumControlOperands());
}
- void setLowerBound(Value bound) { (*this)->setOperand(0, bound); }
- void setUpperBound(Value bound) { (*this)->setOperand(1, bound); }
- void setStep(Value step) { (*this)->setOperand(2, step); }
+ void setLowerBound(mlir::Value bound) { (*this)->setOperand(0, bound); }
+ void setUpperBound(mlir::Value bound) { (*this)->setOperand(1, bound); }
+ void setStep(mlir::Value step) { (*this)->setOperand(2, step); }
/// Number of region arguments for loop-carried values
unsigned getNumRegionIterArgs() {
@@ -2312,8 +2312,8 @@ def fir_IterWhileOp : region_Op<"iterate_while",
return getOperands().drop_front(getNumControlOperands());
}
- void setLowerBound(Value bound) { (*this)->setOperand(0, bound); }
- void setUpperBound(Value bound) { (*this)->setOperand(1, bound); }
+ void setLowerBound(mlir::Value bound) { (*this)->setOperand(0, bound); }
+ void setUpperBound(mlir::Value bound) { (*this)->setOperand(1, bound); }
void setStep(mlir::Value step) { (*this)->setOperand(2, step); }
/// Number of region arguments for loop-carried values
@@ -2376,18 +2376,18 @@ def fir_CallOp : fir_Op<"call", [CallOpInterface]> {
CArg<"mlir::ValueRange", "{}">:$operands),
[{
build($_builder, $_state,
- SymbolRefAttr::get($_builder.getContext(), callee), results,
+ mlir::SymbolRefAttr::get($_builder.getContext(), callee), results,
operands);
}]>];
let extraClassDeclaration = [{
- static constexpr StringRef getCalleeAttrNameStr() { return "callee"; }
+ static constexpr llvm::StringRef getCalleeAttrNameStr() { return "callee"; }
mlir::FunctionType getFunctionType();
/// Get the argument operands to the called function.
operand_range getArgOperands() {
- if ((*this)->getAttrOfType<SymbolRefAttr>(getCalleeAttrName()))
+ if ((*this)->getAttrOfType<mlir::SymbolRefAttr>(getCalleeAttrName()))
return {arg_operand_begin(), arg_operand_end()};
return {arg_operand_begin() + 1, arg_operand_end()};
}
@@ -2396,9 +2396,9 @@ def fir_CallOp : fir_Op<"call", [CallOpInterface]> {
operand_iterator arg_operand_end() { return operand_end(); }
/// Return the callee of this operation.
- CallInterfaceCallable getCallableForCallee() {
+ mlir::CallInterfaceCallable getCallableForCallee() {
if (auto calling =
- (*this)->getAttrOfType<SymbolRefAttr>(getCalleeAttrName()))
+ (*this)->getAttrOfType<mlir::SymbolRefAttr>(getCalleeAttrName()))
return calling;
return getOperand(0);
}
@@ -2577,12 +2577,12 @@ def fir_CmpcOp : fir_Op<"cmpc",
return "predicate";
}
- arith::CmpFPredicate getPredicate() {
- return (arith::CmpFPredicate)(*this)->getAttrOfType<mlir::IntegerAttr>(
+ mlir::arith::CmpFPredicate getPredicate() {
+ return (mlir::arith::CmpFPredicate)(*this)->getAttrOfType<mlir::IntegerAttr>(
getPredicateAttrName()).getInt();
}
- static arith::CmpFPredicate getPredicateByName(llvm::StringRef name);
+ static mlir::arith::CmpFPredicate getPredicateByName(llvm::StringRef name);
}];
}
@@ -2642,16 +2642,16 @@ def fir_ConvertOp : fir_OneResultOp<"convert", [NoSideEffect]> {
let hasCanonicalizer = 1;
}
-def FortranTypeAttr : Attr<And<[CPred<"$_self.isa<TypeAttr>()">,
- Or<[CPred<"$_self.cast<TypeAttr>().getValue().isa<fir::CharacterType>()">,
- CPred<"$_self.cast<TypeAttr>().getValue().isa<fir::ComplexType>()">,
- CPred<"$_self.cast<TypeAttr>().getValue().isa<fir::IntegerType>()">,
- CPred<"$_self.cast<TypeAttr>().getValue().isa<fir::LogicalType>()">,
- CPred<"$_self.cast<TypeAttr>().getValue().isa<fir::RealType>()">,
- CPred<"$_self.cast<TypeAttr>().getValue().isa<fir::RecordType>()">]>]>,
+def FortranTypeAttr : Attr<And<[CPred<"$_self.isa<mlir::TypeAttr>()">,
+ Or<[CPred<"$_self.cast<mlir::TypeAttr>().getValue().isa<fir::CharacterType>()">,
+ CPred<"$_self.cast<mlir::TypeAttr>().getValue().isa<fir::ComplexType>()">,
+ CPred<"$_self.cast<mlir::TypeAttr>().getValue().isa<fir::IntegerType>()">,
+ CPred<"$_self.cast<mlir::TypeAttr>().getValue().isa<fir::LogicalType>()">,
+ CPred<"$_self.cast<mlir::TypeAttr>().getValue().isa<fir::RealType>()">,
+ CPred<"$_self.cast<mlir::TypeAttr>().getValue().isa<fir::RecordType>()">]>]>,
"Fortran surface type"> {
- let storageType = [{ TypeAttr }];
- let returnType = "Type";
+ let storageType = [{ ::mlir::TypeAttr }];
+ let returnType = "mlir::Type";
let convertFromStorage = "$_self.getValue().cast<Type>()";
}
@@ -2773,7 +2773,7 @@ def fir_GlobalOp : fir_Op<"global", [IsolatedFromAbove, Symbol]> {
mlir::Type resultType();
/// Return the initializer attribute if it exists, or a null attribute.
- Attribute getValueOrNull() { return getInitVal().getValueOr(Attribute()); }
+ mlir::Attribute getValueOrNull() { return getInitVal().getValueOr(mlir::Attribute()); }
/// Append the next initializer value to the `GlobalOp` to construct
/// the variable's initial value.
@@ -2783,11 +2783,11 @@ def fir_GlobalOp : fir_Op<"global", [IsolatedFromAbove, Symbol]> {
mlir::Block &getBlock() { return getRegion().front(); }
/// Determine if `linkage` is a supported keyword
- static mlir::ParseResult verifyValidLinkage(StringRef linkage);
+ static mlir::ParseResult verifyValidLinkage(llvm::StringRef linkage);
bool hasInitializationBody() {
return ((*this)->getNumRegions() == 1) && !getRegion().empty() &&
- !isa<fir::FirEndOp>(getBlock().front());
+ !mlir::isa<fir::FirEndOp>(getBlock().front());
}
mlir::FlatSymbolRefAttr getSymbol() {
diff --git a/flang/include/flang/Optimizer/Dialect/FIROpsSupport.h b/flang/include/flang/Optimizer/Dialect/FIROpsSupport.h
index 28fecd3ad93e8..1f2c0760a3645 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROpsSupport.h
+++ b/flang/include/flang/Optimizer/Dialect/FIROpsSupport.h
@@ -17,15 +17,16 @@ namespace fir {
/// return true iff the Operation is a non-volatile LoadOp
inline bool nonVolatileLoad(mlir::Operation *op) {
- if (auto load = dyn_cast<fir::LoadOp>(op))
+ if (auto load = mlir::dyn_cast<fir::LoadOp>(op))
return !load->getAttr("volatile");
return false;
}
/// return true iff the Operation is a call
inline bool isaCall(mlir::Operation *op) {
- return isa<fir::CallOp>(op) || isa<fir::DispatchOp>(op) ||
- isa<mlir::func::CallOp>(op) || isa<mlir::func::CallIndirectOp>(op);
+ return mlir::isa<fir::CallOp>(op) || llvm::isa<fir::DispatchOp>(op) ||
+ mlir::isa<mlir::func::CallOp>(op) ||
+ mlir::isa<mlir::func::CallIndirectOp>(op);
}
/// return true iff the Operation is a fir::CallOp, fir::DispatchOp,
diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
index beb2a364e24a1..8e78467b38f86 100644
--- a/flang/lib/Lower/Bridge.cpp
+++ b/flang/lib/Lower/Bridge.cpp
@@ -41,6 +41,8 @@
#define DEBUG_TYPE "flang-lower-bridge"
+using namespace mlir;
+
static llvm::cl::opt<bool> dumpBeforeFir(
"fdebug-dump-pre-fir", llvm::cl::init(false),
llvm::cl::desc("dump the Pre-FIR tree prior to FIR generation"));
diff --git a/flang/lib/Lower/CallInterface.cpp b/flang/lib/Lower/CallInterface.cpp
index d1cd6f5b2ca21..c077390aa487f 100644
--- a/flang/lib/Lower/CallInterface.cpp
+++ b/flang/lib/Lower/CallInterface.cpp
@@ -595,7 +595,7 @@ class Fortran::lower::CallInterfaceImpl {
}
void appendHostAssocTupleArg(mlir::Type tupTy) {
- MLIRContext *ctxt = tupTy.getContext();
+ mlir::MLIRContext *ctxt = tupTy.getContext();
addFirOperand(tupTy, nextPassedArgPosition(), Property::BaseAddress,
{mlir::NamedAttribute{
mlir::StringAttr::get(ctxt, fir::getHostAssocAttrName()),
diff --git a/flang/lib/Lower/IO.cpp b/flang/lib/Lower/IO.cpp
index 4f194f9e7496e..9acb8ae8b5ffb 100644
--- a/flang/lib/Lower/IO.cpp
+++ b/flang/lib/Lower/IO.cpp
@@ -31,6 +31,8 @@
#define DEBUG_TYPE "flang-lower-io"
+using namespace mlir;
+
// Define additional runtime type models specific to IO.
namespace fir::runtime {
template <>
diff --git a/flang/lib/Lower/OpenACC.cpp b/flang/lib/Lower/OpenACC.cpp
index f7c8c1f38da0c..826e86b2970a0 100644
--- a/flang/lib/Lower/OpenACC.cpp
+++ b/flang/lib/Lower/OpenACC.cpp
@@ -23,6 +23,8 @@
#include "mlir/Dialect/OpenACC/OpenACC.h"
#include "llvm/Frontend/OpenACC/ACC.h.inc"
+using namespace mlir;
+
static const Fortran::parser::Name *
getDesignatorNameIfDataRef(const Fortran::parser::Designator &designator) {
const auto *dataRef{std::get_if<Fortran::parser::DataRef>(&designator.u)};
diff --git a/flang/lib/Lower/OpenMP.cpp b/flang/lib/Lower/OpenMP.cpp
index 9e64ab053d547..2c2ca3b529870 100644
--- a/flang/lib/Lower/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP.cpp
@@ -23,6 +23,8 @@
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "llvm/Frontend/OpenMP/OMPConstants.h"
+using namespace mlir;
+
static const Fortran::parser::Name *
getDesignatorNameIfDataRef(const Fortran::parser::Designator &designator) {
const auto *dataRef = std::get_if<Fortran::parser::DataRef>(&designator.u);
diff --git a/flang/lib/Optimizer/Builder/Character.cpp b/flang/lib/Optimizer/Builder/Character.cpp
index 4a1226eec0aba..7819ce8e69f4a 100644
--- a/flang/lib/Optimizer/Builder/Character.cpp
+++ b/flang/lib/Optimizer/Builder/Character.cpp
@@ -18,6 +18,8 @@
#define DEBUG_TYPE "flang-lower-character"
+using namespace mlir;
+
//===----------------------------------------------------------------------===//
// CharacterExprHelper implementation
//===----------------------------------------------------------------------===//
diff --git a/flang/lib/Optimizer/Builder/DoLoopHelper.cpp b/flang/lib/Optimizer/Builder/DoLoopHelper.cpp
index 54c44f1dc81e5..4b12e281b5153 100644
--- a/flang/lib/Optimizer/Builder/DoLoopHelper.cpp
+++ b/flang/lib/Optimizer/Builder/DoLoopHelper.cpp
@@ -43,6 +43,6 @@ fir::factory::DoLoopHelper::createLoop(mlir::Value count,
auto indexType = builder.getIndexType();
auto zero = builder.createIntegerConstant(loc, indexType, 0);
auto one = builder.createIntegerConstant(loc, count.getType(), 1);
- auto up = builder.create<arith::SubIOp>(loc, count, one);
+ auto up = builder.create<mlir::arith::SubIOp>(loc, count, one);
return createLoop(zero, up, one, bodyGenerator);
}
diff --git a/flang/lib/Optimizer/Builder/FIRBuilder.cpp b/flang/lib/Optimizer/Builder/FIRBuilder.cpp
index daf6c55e578d5..f8ae937f7318d 100644
--- a/flang/lib/Optimizer/Builder/FIRBuilder.cpp
+++ b/flang/lib/Optimizer/Builder/FIRBuilder.cpp
@@ -71,7 +71,7 @@ mlir::Type fir::FirOpBuilder::getRealType(int kind) {
case llvm::Type::TypeID::FP128TyID:
return mlir::FloatType::getF128(getContext());
default:
- fir::emitFatalError(UnknownLoc::get(getContext()),
+ fir::emitFatalError(mlir::UnknownLoc::get(getContext()),
"unsupported type !fir.real<kind>");
}
}
diff --git a/flang/lib/Optimizer/Builder/MutableBox.cpp b/flang/lib/Optimizer/Builder/MutableBox.cpp
index 5cb65461d0db8..66bdb99cf9cc6 100644
--- a/flang/lib/Optimizer/Builder/MutableBox.cpp
+++ b/flang/lib/Optimizer/Builder/MutableBox.cpp
@@ -586,9 +586,9 @@ void fir::factory::associateMutableBoxWithRemap(
for (auto [lb, ub] : llvm::zip(lbounds, ubounds)) {
auto lbi = builder.createConvert(loc, idxTy, lb);
auto ubi = builder.createConvert(loc, idxTy, ub);
- auto
diff = builder.create<arith::SubIOp>(loc, idxTy, ubi, lbi);
+ auto
diff = builder.create<mlir::arith::SubIOp>(loc, idxTy, ubi, lbi);
extents.emplace_back(
- builder.create<arith::AddIOp>(loc, idxTy,
diff , one));
+ builder.create<mlir::arith::AddIOp>(loc, idxTy,
diff , one));
}
} else {
// lbounds are default. Upper bounds and extents are the same.
diff --git a/flang/lib/Optimizer/CodeGen/CGOps.h b/flang/lib/Optimizer/CodeGen/CGOps.h
index c6419aad9b379..b5a6d5bb9a9e6 100644
--- a/flang/lib/Optimizer/CodeGen/CGOps.h
+++ b/flang/lib/Optimizer/CodeGen/CGOps.h
@@ -16,8 +16,6 @@
#include "flang/Optimizer/Dialect/FIRType.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
-using namespace mlir;
-
#define GET_OP_CLASSES
#include "flang/Optimizer/CodeGen/CGOps.h.inc"
diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
index 9b6e1c958aec7..507b11fdfaede 100644
--- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp
+++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
@@ -31,6 +31,8 @@
#define DEBUG_TYPE "flang-codegen"
+using namespace mlir;
+
// fir::LLVMTypeConverter for converting to LLVM IR dialect types.
#include "TypeConverter.h"
diff --git a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
index 5ebf14bf4b00c..e1db692868829 100644
--- a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
+++ b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
@@ -26,6 +26,7 @@
//===----------------------------------------------------------------------===//
using namespace fir;
+using namespace mlir;
#define DEBUG_TYPE "flang-codegen-rewrite"
diff --git a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
index ef4b59ee7bf05..791e70427f25a 100644
--- a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
+++ b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
@@ -30,6 +30,7 @@
#include "llvm/Support/Debug.h"
using namespace fir;
+using namespace mlir;
#define DEBUG_TYPE "flang-target-rewrite"
diff --git a/flang/lib/Optimizer/Dialect/FIRDialect.cpp b/flang/lib/Optimizer/Dialect/FIRDialect.cpp
index 6193924651cc1..9a936aed7fda0 100644
--- a/flang/lib/Optimizer/Dialect/FIRDialect.cpp
+++ b/flang/lib/Optimizer/Dialect/FIRDialect.cpp
@@ -42,7 +42,7 @@ struct FIRInlinerInterface : public mlir::DialectInlinerInterface {
/// return.
void handleTerminator(mlir::Operation *op,
llvm::ArrayRef<mlir::Value> valuesToRepl) const final {
- auto returnOp = cast<mlir::func::ReturnOp>(op);
+ auto returnOp = llvm::cast<mlir::func::ReturnOp>(op);
assert(returnOp.getNumOperands() == valuesToRepl.size());
for (const auto &it : llvm::enumerate(returnOp.getOperands()))
valuesToRepl[it.index()].replaceAllUsesWith(it.value());
diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp
index f2b45e6a82f2f..d78a4920ea42c 100644
--- a/flang/lib/Optimizer/Dialect/FIROps.cpp
+++ b/flang/lib/Optimizer/Dialect/FIROps.cpp
@@ -32,6 +32,7 @@ namespace {
#include "flang/Optimizer/Dialect/CanonicalizationPatterns.inc"
} // namespace
using namespace fir;
+using namespace mlir;
/// Return true if a sequence type is of some incomplete size or a record type
/// is malformed or contains an incomplete sequence type. An incomplete sequence
diff --git a/flang/lib/Optimizer/Transforms/AffineDemotion.cpp b/flang/lib/Optimizer/Transforms/AffineDemotion.cpp
index 01f2c99eb7561..15d8a4ece69f8 100644
--- a/flang/lib/Optimizer/Transforms/AffineDemotion.cpp
+++ b/flang/lib/Optimizer/Transforms/AffineDemotion.cpp
@@ -39,6 +39,7 @@
#define DEBUG_TYPE "flang-affine-demotion"
using namespace fir;
+using namespace mlir;
namespace {
diff --git a/flang/lib/Optimizer/Transforms/AffinePromotion.cpp b/flang/lib/Optimizer/Transforms/AffinePromotion.cpp
index e771c2c921621..b7894321825f9 100644
--- a/flang/lib/Optimizer/Transforms/AffinePromotion.cpp
+++ b/flang/lib/Optimizer/Transforms/AffinePromotion.cpp
@@ -34,6 +34,7 @@
#define DEBUG_TYPE "flang-affine-promotion"
using namespace fir;
+using namespace mlir;
namespace {
struct AffineLoopAnalysis;
diff --git a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
index e9c4ef995deda..fb03cf0d81339 100644
--- a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
+++ b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
@@ -21,6 +21,7 @@
#define DEBUG_TYPE "flang-array-value-copy"
using namespace fir;
+using namespace mlir;
using OperationUseMapT = llvm::DenseMap<mlir::Operation *, mlir::Operation *>;
diff --git a/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp b/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp
index a32dbee766f69..d448eda30a457 100644
--- a/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp
+++ b/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp
@@ -17,6 +17,8 @@
#include "mlir/Pass/Pass.h"
#include "mlir/Transforms/DialectConversion.h"
+using namespace mlir;
+
//===----------------------------------------------------------------------===//
// Helper functions
//===----------------------------------------------------------------------===//
diff --git a/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp b/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp
index 726fa015920d8..4ce456643f2af 100644
--- a/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp
+++ b/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp
@@ -21,6 +21,8 @@
#define DEBUG_TYPE "fir-memref-dataflow-opt"
+using namespace mlir;
+
namespace {
template <typename OpT>
diff --git a/flang/lib/Optimizer/Transforms/RewriteLoop.cpp b/flang/lib/Optimizer/Transforms/RewriteLoop.cpp
index c2a9cc7bac0d3..f46df8b2a7ef0 100644
--- a/flang/lib/Optimizer/Transforms/RewriteLoop.cpp
+++ b/flang/lib/Optimizer/Transforms/RewriteLoop.cpp
@@ -18,6 +18,7 @@
#include "llvm/Support/CommandLine.h"
using namespace fir;
+using namespace mlir;
namespace {
diff --git a/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp b/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp
index 54bcf7f5f42f4..80cf1655df053 100644
--- a/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp
+++ b/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp
@@ -12,6 +12,8 @@
#include "flang/Optimizer/Support/KindMapping.h"
#include <string>
+using namespace mlir;
+
struct DoLoopHelperTest : public testing::Test {
public:
void SetUp() {
diff --git a/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp b/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp
index d29114cb16080..bb8577a87fe50 100644
--- a/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp
+++ b/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp
@@ -12,6 +12,8 @@
#include "flang/Optimizer/Support/InitFIR.h"
#include "flang/Optimizer/Support/KindMapping.h"
+using namespace mlir;
+
struct FIRBuilderTest : public testing::Test {
public:
void SetUp() override {
diff --git a/flang/unittests/Optimizer/Builder/Runtime/CharacterTest.cpp b/flang/unittests/Optimizer/Builder/Runtime/CharacterTest.cpp
index 9ff0da03cf045..3ab30ff380bf8 100644
--- a/flang/unittests/Optimizer/Builder/Runtime/CharacterTest.cpp
+++ b/flang/unittests/Optimizer/Builder/Runtime/CharacterTest.cpp
@@ -11,6 +11,8 @@
#include "gtest/gtest.h"
#include "flang/Optimizer/Builder/Character.h"
+using namespace mlir;
+
TEST_F(RuntimeCallTest, genAdjustLTest) {
auto loc = firBuilder->getUnknownLoc();
mlir::Value result = firBuilder->create<fir::UndefOp>(loc, boxTy);
diff --git a/flang/unittests/Optimizer/Builder/Runtime/NumericTest.cpp b/flang/unittests/Optimizer/Builder/Runtime/NumericTest.cpp
index 0941da91e71e9..becaa3c69f6c4 100644
--- a/flang/unittests/Optimizer/Builder/Runtime/NumericTest.cpp
+++ b/flang/unittests/Optimizer/Builder/Runtime/NumericTest.cpp
@@ -10,6 +10,8 @@
#include "RuntimeCallTestBase.h"
#include "gtest/gtest.h"
+using namespace mlir;
+
void testGenExponent(fir::FirOpBuilder &builder, mlir::Type resultType,
mlir::Type xType, llvm::StringRef fctName) {
auto loc = builder.getUnknownLoc();
diff --git a/flang/unittests/Optimizer/Builder/Runtime/ReductionTest.cpp b/flang/unittests/Optimizer/Builder/Runtime/ReductionTest.cpp
index b3be60d708363..3867285cc09ec 100644
--- a/flang/unittests/Optimizer/Builder/Runtime/ReductionTest.cpp
+++ b/flang/unittests/Optimizer/Builder/Runtime/ReductionTest.cpp
@@ -210,8 +210,8 @@ TEST_F(RuntimeCallTest, genDotProduct) {
}
void checkGenMxxloc(fir::FirOpBuilder &builder,
- void (*genFct)(fir::FirOpBuilder &, Location, mlir::Value, mlir::Value,
- mlir::Value, mlir::Value, mlir::Value),
+ void (*genFct)(fir::FirOpBuilder &, mlir::Location, mlir::Value,
+ mlir::Value, mlir::Value, mlir::Value, mlir::Value),
llvm::StringRef fctName, unsigned nbArgs) {
mlir::Location loc = builder.getUnknownLoc();
mlir::Type i32Ty = builder.getI32Type();
@@ -236,8 +236,8 @@ TEST_F(RuntimeCallTest, genMinlocTest) {
}
void checkGenMxxlocDim(fir::FirOpBuilder &builder,
- void (*genFct)(fir::FirOpBuilder &, Location, mlir::Value, mlir::Value,
- mlir::Value, mlir::Value, mlir::Value, mlir::Value),
+ void (*genFct)(fir::FirOpBuilder &, mlir::Location, mlir::Value,
+ mlir::Value, mlir::Value, mlir::Value, mlir::Value, mlir::Value),
llvm::StringRef fctName, unsigned nbArgs) {
mlir::Location loc = builder.getUnknownLoc();
auto i32Ty = builder.getI32Type();
@@ -265,8 +265,8 @@ TEST_F(RuntimeCallTest, genMinlocDimTest) {
}
void checkGenMxxvalChar(fir::FirOpBuilder &builder,
- void (*genFct)(
- fir::FirOpBuilder &, Location, mlir::Value, mlir::Value, mlir::Value),
+ void (*genFct)(fir::FirOpBuilder &, mlir::Location, mlir::Value,
+ mlir::Value, mlir::Value),
llvm::StringRef fctName, unsigned nbArgs) {
mlir::Location loc = builder.getUnknownLoc();
auto i32Ty = builder.getI32Type();
@@ -291,8 +291,8 @@ TEST_F(RuntimeCallTest, genMinvalCharTest) {
}
void checkGen4argsDim(fir::FirOpBuilder &builder,
- void (*genFct)(fir::FirOpBuilder &, Location, mlir::Value, mlir::Value,
- mlir::Value, mlir::Value),
+ void (*genFct)(fir::FirOpBuilder &, mlir::Location, mlir::Value,
+ mlir::Value, mlir::Value, mlir::Value),
llvm::StringRef fctName, unsigned nbArgs) {
mlir::Location loc = builder.getUnknownLoc();
auto i32Ty = builder.getI32Type();
More information about the flang-commits
mailing list