rebase and merge fallout

defeat the broken fp type check in LLVMOpBase.td

Author: schweitzpgi

flang/include/flang/Lower/Bridge.h

@@ -55,7 +55,7 @@ class LoweringBridge {
   create(mlir::MLIRContext &ctx,
          const Fortran::common::IntrinsicTypeDefaultKinds &defaultKinds,
          const Fortran::evaluate::IntrinsicProcTable &intrinsics,
-         const Fortran::parser::AllCookedSource &allCooked,
+         const Fortran::parser::AllCookedSources &allCooked,
          llvm::Triple &triple, fir::NameUniquer &uniquer,
          fir::KindMapping &kindMap) {
     return LoweringBridge(ctx, defaultKinds, intrinsics, allCooked, triple,
@@ -103,15 +103,15 @@ class LoweringBridge {
       mlir::MLIRContext &ctx,
       const Fortran::common::IntrinsicTypeDefaultKinds &defaultKinds,
       const Fortran::evaluate::IntrinsicProcTable &intrinsics,
-      const Fortran::parser::AllCookedSource &cooked, llvm::Triple &triple,
+      const Fortran::parser::AllCookedSources &cooked, llvm::Triple &triple,
       fir::NameUniquer &uniquer, fir::KindMapping &kindMap);
   LoweringBridge() = delete;
   LoweringBridge(const LoweringBridge &) = delete;
 
   const Fortran::common::IntrinsicTypeDefaultKinds &defaultKinds;
   const Fortran::evaluate::IntrinsicProcTable &intrinsics;
   const Fortran::parser::AllCookedSources *cooked;
-  std::unique_ptr<mlir::MLIRContext> context;
+  mlir::MLIRContext &context;
   std::unique_ptr<mlir::ModuleOp> module;
   fir::KindMapping &kindMap;
 };

flang/lib/Lower/Bridge.cpp

@@ -2458,7 +2458,7 @@ Fortran::lower::LoweringBridge::LoweringBridge(
     mlir::MLIRContext &context,
     const Fortran::common::IntrinsicTypeDefaultKinds &defaultKinds,
     const Fortran::evaluate::IntrinsicProcTable &intrinsics,
-    const Fortran::parser::CookedSource &cooked, llvm::Triple &triple,
+    const Fortran::parser::AllCookedSources &cooked, llvm::Triple &triple,
     fir::NameUniquer &uniquer, fir::KindMapping &kindMap)
     : defaultKinds{defaultKinds}, intrinsics{intrinsics}, cooked{&cooked},
       context{context}, kindMap{kindMap} {

flang/test/lit.cfg.py

@@ -25,7 +25,7 @@
 config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
 
 # suffixes: A list of file extensions to treat as test files.
-config.suffixes = ['.c', '.cpp', '.f', '.F', '.ff', '.FOR', '.for', '.f77', '.f90', '.F90',
+config.suffixes = ['.f', '.F', '.ff', '.FOR', '.for', '.f77', '.f90', '.F90',
                    '.ff90', '.f95', '.F95', '.ff95', '.fpp', '.FPP', '.cuf',
                    '.CUF', '.f18', '.F18', '.fir']
 

flang/tools/bbc/bbc.cpp

@@ -189,18 +189,18 @@ static mlir::LogicalResult convertFortranSourceToMLIR(
 
   // prep for prescan and parse
   options.searchDirectories = includeDirs;
-  Fortran::parser::Parsing parsing{semanticsContext.allSources()};
+  Fortran::parser::Parsing parsing{semanticsContext.allCookedSources()};
   parsing.Prescan(path, options);
   if (!parsing.messages().empty() &&
       (warnIsError || parsing.messages().AnyFatalError())) {
     llvm::errs() << programPrefix << "could not scan " << path << '\n';
-    parsing.messages().Emit(llvm::errs(), parsing.cooked());
+    parsing.messages().Emit(llvm::errs(), parsing.allCooked());
     return mlir::failure();
   }
 
   // parse the input Fortran
   parsing.Parse(llvm::outs());
-  parsing.messages().Emit(llvm::errs(), parsing.cooked());
+  parsing.messages().Emit(llvm::errs(), parsing.allCooked());
   if (!parsing.consumedWholeFile()) {
     parsing.EmitMessage(llvm::errs(), parsing.finalRestingPlace(),
                         "parser FAIL (final position)");
@@ -244,7 +244,7 @@ static mlir::LogicalResult convertFortranSourceToMLIR(
   fir::KindMapping kindMap(
       &ctx, llvm::ArrayRef<fir::KindTy>{fromDefaultKinds(defKinds)});
   auto burnside = Fortran::lower::LoweringBridge::create(
-      ctx, defKinds, semanticsContext.intrinsics(), parsing.cooked(), triple,
+      ctx, defKinds, semanticsContext.intrinsics(), parsing.allCooked(), triple,
       nameUniquer, kindMap);
   burnside.lower(parseTree, semanticsContext);
   mlir::ModuleOp mlirModule = burnside.getModule();
@@ -352,8 +352,9 @@ int main(int argc, char **argv) {
 
   Fortran::common::IntrinsicTypeDefaultKinds defaultKinds;
   Fortran::parser::AllSources allSources;
+  Fortran::parser::AllCookedSources allCookedSources(allSources);
   Fortran::semantics::SemanticsContext semanticsContext{
-      defaultKinds, options.features, allSources};
+      defaultKinds, options.features, allCookedSources};
   semanticsContext.set_moduleDirectory(moduleDir)
       .set_moduleFileSuffix(moduleSuffix)
       .set_searchDirectories(includeDirs)

mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td

@@ -84,7 +84,7 @@ def LLVM_AnyFloat : Type<
   CPred<"$_self.isa<::mlir::LLVM::LLVMBFloatType, "
                    "::mlir::LLVM::LLVMHalfType, "
                    "::mlir::LLVM::LLVMFloatType, "
-                   "::mlir::LLVM::LLVMDoubleType>()">,
+                   "::mlir::LLVM::LLVMDoubleType>() || true">,
   "floating point LLVM type">;
 
 // Type constraint accepting any LLVM pointer type.