type-bound-call-mismatch.f90 fix

Author: Meinersbur

flang/test/Lower/HLFIR/type-bound-call-mismatch.f90

@@ -1,6 +1,6 @@
 ! Test interface that lowering handles small interface mismatch with
 ! type bound procedures.
-! RUN: bbc -emit-hlfir %s -o - -I nw | FileCheck %s
+! RUN: %bbc_bare -emit-hlfir %s -o - -I nw | FileCheck %s
 
 module dispatch_mismatch
 type t

flang/test/lit.cfg.py

@@ -184,6 +184,12 @@ def get_default_intrinsic_module_path():
         command=FindTool("bbc"),
          extra_args= intrinsics_search_args+extra_intrinsics_search_args,
            unresolved="fatal",
+        ),
+                ToolSubst(
+                 "%bbc_bare",
+        command=FindTool("bbc"),
+         extra_args= [],
+           unresolved="fatal",
         )
 ]
 
@@ -222,7 +228,7 @@ def get_default_intrinsic_module_path():
 
 print(f"config.have_flangrt_mod: { config.have_flangrt_mod}")
 config.available_features.add("module-independent")
-if config.have_flangrt_mod:
+if config.have_flangrt_mod or config.flang_intrinsic_modules_dir:
    config.available_features.add("flangrt-modules")
 else:
    config.limit_to_features.add("module-independent")

flang/tools/bbc/bbc.cpp

@@ -102,8 +102,11 @@ static llvm::cl::alias
                           llvm::cl::desc("intrinsic module directory"),
                           llvm::cl::aliasopt(intrinsicIncludeDirs));
 
+#if 0
 static llvm::cl::alias  intrinsicModulePath("fintrinsic-modules-path", llvm::cl::desc("intrinsic module search paths"), llvm::cl::aliasopt(intrinsicIncludeDirs));
-
+#else 
+static llvm::cl::list<std::string>  intrinsicModulePath("fintrinsic-modules-path", llvm::cl::desc("intrinsic module search paths"));
+#endif 
 
 
 static llvm::cl::opt<std::string>
@@ -576,13 +579,13 @@ int main(int argc, char **argv) {
   ProgramName programPrefix;
   programPrefix = argv[0] + ": "s;
 
-//std::vector <std::string> intrinsicsDirs ( intrinsicIncludeDirs.begin(), intrinsicIncludeDirs.end());
+std::vector <std::string> intrinsicsDirs ( intrinsicIncludeDirs.begin(), intrinsicIncludeDirs.end());
 
   if (includeDirs.size() == 0) {
     includeDirs.push_back(".");
 
 
-#if 0
+#if 1
     // Default Fortran modules should be installed in finclude/<target-triple> of the resource directory
 
 
@@ -676,7 +679,7 @@ vfs->makeAbsolute (resourceDir);
     options.isFixedForm = fixedForm;
   }
 
-#if 0
+#if 1
     llvm::errs() << "\nsearch dirs:\n";
   for (auto&& x : intrinsicsDirs) {
   llvm::errs() << x << "\n";
@@ -692,7 +695,7 @@ vfs->makeAbsolute (resourceDir);
   semanticsContext.set_moduleDirectory(moduleDir)
       .set_moduleFileSuffix(moduleSuffix)
       .set_searchDirectories(includeDirs)
-      .set_intrinsicModuleDirectories(intrinsicIncludeDirs)
+      .set_intrinsicModuleDirectories(intrinsicsDirs)
       .set_warnOnNonstandardUsage(warnStdViolation)
       .set_warningsAreErrors(warnIsError);