[rebase] align Optimizer unit tests with llvm versions

Author: jeanPerier

flang/include/flang/Optimizer/Support/InitFIR.h

@@ -27,7 +27,9 @@ namespace fir::support {
 #define FLANG_NONCODEGEN_DIALECT_LIST                                          \
   mlir::AffineDialect, FIROpsDialect, mlir::acc::OpenACCDialect,               \
       mlir::omp::OpenMPDialect, mlir::scf::SCFDialect,                         \
-      mlir::StandardOpsDialect, mlir::vector::VectorDialect
+      mlir::arith::ArithmeticDialect, mlir::StandardOpsDialect,                \
+      mlir::vector::VectorDialect
+
 
 // The definitive list of dialects used by flang.
 #define FLANG_DIALECT_LIST                                                     \

flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp

@@ -29,9 +29,9 @@ struct DoLoopHelperTest : public testing::Test {
 };
 
 void checkConstantValue(const mlir::Value &value, int64_t v) {
-  EXPECT_TRUE(mlir::isa<ConstantOp>(value.getDefiningOp()));
-  auto cstOp = dyn_cast<ConstantOp>(value.getDefiningOp());
-  auto valueAttr = cstOp.getValue().dyn_cast_or_null<IntegerAttr>();
+  EXPECT_TRUE(mlir::isa<mlir::arith::ConstantOp>(value.getDefiningOp()));
+  auto cstOp = dyn_cast<mlir::arith::ConstantOp>(value.getDefiningOp());
+  auto valueAttr = cstOp.value().dyn_cast_or_null<IntegerAttr>();
   EXPECT_EQ(v, valueAttr.getInt());
 }
 

flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp

@@ -48,10 +48,10 @@ static arith::CmpIOp createCondition(fir::FirOpBuilder &builder) {
 }
 
 static void checkIntegerConstant(mlir::Value value, mlir::Type ty, int64_t v) {
-  EXPECT_TRUE(mlir::isa<ConstantOp>(value.getDefiningOp()));
-  auto cstOp = dyn_cast<ConstantOp>(value.getDefiningOp());
+  EXPECT_TRUE(mlir::isa<mlir::arith::ConstantOp>(value.getDefiningOp()));
+  auto cstOp = dyn_cast<mlir::arith::ConstantOp>(value.getDefiningOp());
   EXPECT_EQ(ty, cstOp.getType());
-  auto valueAttr = cstOp.getValue().dyn_cast_or_null<IntegerAttr>();
+  auto valueAttr = cstOp.value().dyn_cast_or_null<IntegerAttr>();
   EXPECT_EQ(v, valueAttr.getInt());
 }
 

flang/unittests/Optimizer/CMakeLists.txt

@@ -9,7 +9,7 @@ set(LIBS
 )
 
 add_flang_unittest(FlangOptimizerTests
-  Builder/CharacterTest.cpp  
+  Builder/CharacterTest.cpp
   Builder/DoLoopHelperTest.cpp
   Builder/FIRBuilderTest.cpp
   FIRContextTest.cpp

flang/unittests/Optimizer/RTBuilder.cpp

@@ -9,7 +9,6 @@
 #include "flang/Optimizer/Builder/Runtime/RTBuilder.h"
 #include "flang/Optimizer/Support/InitFIR.h"
 #include "gtest/gtest.h"
-#include <complex>
 
 // Check that it is possible to make a difference between complex runtime
 // function using C99 complex and C++ std::complex. This is important since
@@ -21,7 +20,9 @@
 c_float_complex_t c99_cacosf(c_float_complex_t);
 
 TEST(RTBuilderTest, ComplexRuntimeInterface) {
-  mlir::MLIRContext ctx;
+  mlir::DialectRegistry registry;
+  fir::support::registerDialects(registry);
+  mlir::MLIRContext ctx(registry);
   fir::support::loadDialects(ctx);
   mlir::Type c99_cacosf_signature{
       fir::runtime::RuntimeTableKey<decltype(c99_cacosf)>::getTypeModel()(