disable affine in bbc

fix a few bugs

Author: schweitzpgi

flang/include/flang/Optimizer/Dialect/FIRDialect.h

@@ -9,14 +9,14 @@
 #ifndef OPTIMIZER_DIALECT_FIRDIALECT_H
 #define OPTIMIZER_DIALECT_FIRDIALECT_H
 
+#include "mlir/Conversion/Passes.h"
+#include "mlir/Dialect/Affine/Passes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/InitAllDialects.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassRegistry.h"
-#include "mlir/Transforms/Passes.h"
 #include "mlir/Transforms/LocationSnapshot.h"
-#include "mlir/Dialect/Affine/Passes.h"
-#include "mlir/Conversion/Passes.h"
+#include "mlir/Transforms/Passes.h"
 
 namespace fir {
 
@@ -79,9 +79,7 @@ inline void registerGeneralPasses() {
   mlir::registerConvertAffineToStandardPass();
 }
 
-inline void registerFIRPasses() {
-  registerGeneralPasses();
-}
+inline void registerFIRPasses() { registerGeneralPasses(); }
 
 } // namespace fir
 

flang/include/flang/Optimizer/Transforms/RewritePatterns.td

@@ -51,8 +51,9 @@ def createConstantOp
                      "rewriter.getIndexAttr($1.dyn_cast<IntegerAttr>().getInt()))">;
 
 def ForwardConstantConvertPattern
-    : Pat<(fir_ConvertOp:$res (ConstantOp $attr)),
+    : Pat<(fir_ConvertOp:$res (ConstantOp:$cnt $attr)),
           (createConstantOp $res, $attr),
-          [(IndexTypePred $res)]>;
+          [(IndexTypePred $res)
+          ,(IntegerTypePred $cnt)]>;
 
 #endif // FIR_REWRITE_PATTERNS

flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp

@@ -453,7 +453,7 @@ class TargetRewrite : public TargetRewriteBase<TargetRewrite> {
     if (fnTy.getResults().size() == 1) {
       mlir::Type ty = fnTy.getResult(0);
       llvm::TypeSwitch<mlir::Type>(ty)
-        .template Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
+          .template Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
             wrap = rewriteCallComplexResultType(cmplx, newResTys, newInTys,
                                                 newOpers);
           })
@@ -506,13 +506,16 @@ class TargetRewrite : public TargetRewriteBase<TargetRewrite> {
               }
             }
           })
-        .template Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
+          .template Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
             rewriteCallComplexInputType(cmplx, oper, newInTys, newOpers);
           })
           .template Case<mlir::ComplexType>([&](mlir::ComplexType cmplx) {
             rewriteCallComplexInputType(cmplx, oper, newInTys, newOpers);
           })
-          .Default([&](mlir::Type ty) { newInTys.push_back(ty); });
+          .Default([&](mlir::Type ty) {
+            newInTys.push_back(ty);
+            newOpers.push_back(oper);
+          });
     }
     newInTys.insert(newInTys.end(), trailingInTys.begin(), trailingInTys.end());
     newOpers.insert(newOpers.end(), trailingOpers.begin(), trailingOpers.end());
@@ -564,7 +567,7 @@ class TargetRewrite : public TargetRewriteBase<TargetRewrite> {
     llvm::SmallVector<mlir::Type, 8> newInTys;
     for (mlir::Type ty : addrTy.getResults()) {
       llvm::TypeSwitch<mlir::Type>(ty)
-        .Case<fir::ComplexType>([&](fir::ComplexType ty) {
+          .Case<fir::ComplexType>([&](fir::ComplexType ty) {
             lowerComplexSignatureRes(ty, newResTys, newInTys);
           })
           .Case<mlir::ComplexType>([&](mlir::ComplexType ty) {
@@ -587,8 +590,9 @@ class TargetRewrite : public TargetRewriteBase<TargetRewrite> {
               }
             }
           })
-        .Case<fir::ComplexType>(
-            [&](fir::ComplexType ty) { lowerComplexSignatureArg(ty, newInTys); })
+          .Case<fir::ComplexType>([&](fir::ComplexType ty) {
+            lowerComplexSignatureArg(ty, newInTys);
+          })
           .Case<mlir::ComplexType>([&](mlir::ComplexType ty) {
             lowerComplexSignatureArg(ty, newInTys);
           })
@@ -647,7 +651,7 @@ class TargetRewrite : public TargetRewriteBase<TargetRewrite> {
     // Convert return value(s)
     for (auto ty : funcTy.getResults())
       llvm::TypeSwitch<mlir::Type>(ty)
-        .Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
+          .Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
             if (noComplexConversion)
               newResTys.push_back(cmplx);
             else
@@ -696,7 +700,7 @@ class TargetRewrite : public TargetRewriteBase<TargetRewrite> {
               }
             }
           })
-        .Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
+          .Case<fir::ComplexType>([&](fir::ComplexType cmplx) {
             if (noComplexConversion)
               newInTys.push_back(cmplx);
             else

flang/tools/bbc/bbc.cpp

@@ -264,7 +264,7 @@ static mlir::LogicalResult convertFortranSourceToMLIR(
     pm.addPass(std::make_unique<Fortran::lower::VerifierPass>());
     pm.addPass(mlir::createCanonicalizerPass());
     pm.addPass(fir::createCSEPass());
-    pm.addPass(fir::createPromoteToAffinePass());
+    // pm.addPass(fir::createPromoteToAffinePass());
     pm.addPass(fir::createFirToCfgPass());
     pm.addPass(fir::createControlFlowLoweringPass());
     pm.addPass(mlir::createLowerToCFGPass());