Remove experimental code

Author: Meinersbur

flang/include/flang/Frontend/CompilerInvocation.h

@@ -294,7 +294,7 @@ class CompilerInvocation : public CompilerInvocationBase {
 
   /// Set the Fortran options to user-specified values.
   /// These values are found in the preprocessor options.
-  void setFortranOpts(  const llvm::TargetMachine &targetMachine);
+  void setFortranOpts();
 
   /// Set the Semantic Options
   void setSemanticsOpts(Fortran::parser::AllCookedSources &);

flang/include/flang/Parser/options.h

@@ -26,14 +26,8 @@ struct Options {
   bool isFixedForm{false};
   int fixedFormColumns{72};
   common::LanguageFeatureControl features;
-
-  /// Search paths from -I/-J/-module-dir/-fintrinsic-modules-path for 
   std::vector<std::string> searchDirectories;
-
-  /// Search paths from -fintrinsic-modules-path
-  /// Muliple paths are supported.
-  std::vector<std::string> intrinsicModuleDirectories; 
-
+  std::vector<std::string> intrinsicModuleDirectories;
   std::vector<Predefinition> predefinitions;
   bool instrumentedParse{false};
   bool isModuleFile{false};

flang/include/flang/Semantics/semantics.h

@@ -315,19 +315,9 @@ class SemanticsContext {
   const common::LangOptions &langOpts_;
   parser::AllCookedSources &allCookedSources_;
   std::optional<parser::CharBlock> location_;
-
-  /// Search paths for non-intrinsic modules. 
-  /// Originates from the -J/-module-dir command line options
   std::vector<std::string> searchDirectories_;
-
-  /// Search paths for intrinsic modules.
-  /// Originates from the -fintrinsic-modules-path line option
   std::vector<std::string> intrinsicModuleDirectories_;
-
-  /// Location for emitting module files.
-    /// Originates from the -J/-module-dir command line options
   std::string moduleDirectory_{"."s};
-
   std::string moduleFileSuffix_{".mod"};
   bool underscoring_{true};
   bool warnOnNonstandardUsage_{false};

flang/lib/Frontend/CompilerInstance.cpp

@@ -154,23 +154,14 @@ bool CompilerInstance::executeAction(FrontendAction &act) {
 
   llvm::Triple targetTriple{llvm::Triple(invoc.getTargetOpts().triple)};
 
-
-
-
-  if (!setUpTargetMachine())
-    return false;
-
   // Set some sane defaults for the frontend.
   invoc.setDefaultFortranOpts();
-
-    // Update the fortran options based on user-based input.
-  invoc.setFortranOpts(getTargetMachine());
-
-
-    // Set the encoding to read all input files in based on user input.
+  // Update the fortran options based on user-based input.
+  invoc.setFortranOpts();
+  // Set the encoding to read all input files in based on user input.
   allSources->set_encoding(invoc.getFortranOpts().encoding);
-
-
+  if (!setUpTargetMachine())
+    return false;
   // Set options controlling lowering to FIR.
   invoc.setLoweringOptions();
 

flang/lib/Frontend/CompilerInvocation.cpp

@@ -25,13 +25,11 @@
 #include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Driver/CommonArgs.h"
 #include "clang/Driver/Driver.h"
-#include "clang/Driver/ToolChain.h"
 #include "clang/Driver/OptionUtils.h"
 #include "clang/Driver/Options.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
-#include "llvm/Support/VirtualFileSystem.h"
 #include "llvm/Frontend/Debug/Options.h"
 #include "llvm/Frontend/Driver/CodeGenOptions.h"
 #include "llvm/Option/Arg.h"
@@ -1501,11 +1499,11 @@ bool CompilerInvocation::createFromArgs(
     success = false;
   }
 
-  // User-specified or default resource dir   
+  // User-specified or default resource dir
   if (const llvm::opt::Arg *a =  args.getLastArg(clang::driver::options::OPT_resource_dir))
     invoc.resourceDir = a->getValue(); 
   else 
-    clang::driver::Driver::GetResourcesPath(llvm::sys::fs::getMainExecutable(argv0, nullptr));
+    invoc.resourceDir = clang::driver::Driver::GetResourcesPath(llvm::sys::fs::getMainExecutable(argv0, nullptr));
 
   // -flang-experimental-hlfir
   if (args.hasArg(clang::driver::options::OPT_flang_experimental_hlfir) ||
@@ -1726,7 +1724,7 @@ void CompilerInvocation::setDefaultPredefinitions() {
   }
 }
 
-void CompilerInvocation::setFortranOpts(const llvm::TargetMachine &targetMachine) {
+void CompilerInvocation::setFortranOpts() {
   auto &fortranOptions = getFortranOpts();
   const auto &frontendOptions = getFrontendOpts();
   const auto &preprocessorOptions = getPreprocessorOpts();
@@ -1751,61 +1749,23 @@ void CompilerInvocation::setFortranOpts(const llvm::TargetMachine &targetMachine
       preprocessorOptions.searchDirectoriesFromDashI.begin(),
       preprocessorOptions.searchDirectoriesFromDashI.end());
 
-  // Add the ordered list of -fintrinsic-modules-path
-#if 1
-  // Legacy
-// TODO: should not be used for finding 'INCLUDE' files
+  // Add the ordered list of -intrinsic-modules-path
   fortranOptions.searchDirectories.insert(
       fortranOptions.searchDirectories.end(),
-      preprocessorOptions.searchDirectoriesFromIntrModPath.begin(), // should this be searchDirectoriesFromDashJ???
+      preprocessorOptions.searchDirectoriesFromIntrModPath.begin(),
       preprocessorOptions.searchDirectoriesFromIntrModPath.end());
-#endif 
-
-
-
-
 
 
-  //  Add the default intrinsic module directory
-#if 1
-  // gfortran prepends this path to the usual intrinsics dir
+  // Add the ordered list of -fintrinsic-modules-path
   fortranOptions.intrinsicModuleDirectories.insert(
       fortranOptions.intrinsicModuleDirectories.end(),
       preprocessorOptions.searchDirectoriesFromIntrModPath.begin(),
       preprocessorOptions.searchDirectoriesFromIntrModPath.end());
-#endif
-
-    // FIXME: Assembling the list of module search paths is the driver's job.
-
-#if 0
-  auto vfs = llvm::vfs::createPhysicalFileSystem();
-  auto defaultIntrinsicsDir = clang::driver:: ToolChain:: getDefaultIntrinsicModuleDir(getResourceDir(), targetMachine.getTargetTriple(),*vfs , nullptr) ;
-  if (defaultIntrinsicsDir)
-  fortranOptions.intrinsicModuleDirectories.push_back(*defaultIntrinsicsDir);
-#endif
-
-#if 0
-      llvm::errs() << "\nnew intr search dirs:\n";
-  for (auto&& x : fortranOptions.intrinsicModuleDirectories) {
-  llvm::errs() << x << "\n";
-  }
-  #endif 
-
-  #if 0
-    llvm::SmallString<128> intrinsicsDir { resourceDir };
-    llvm::sys::path::append(intrinsicsDir, "finclude", triple);
-    fortranOptions.intrinsicModuleDirectories.emplace_back(intrinsicsDir);
-   fortranOptions.intrinsicModuleDirectories.emplace_back(getIntrinsicDir(getArgv0()));
-   #endif 
 
-
-     // FIXME: Assembling the list of module search paths is the driver's job.
-  #if 1
   // Add the directory supplied through -J/-module-dir to the list of search
   // directories
   if (moduleDirJ != ".")
     fortranOptions.searchDirectories.emplace_back(moduleDirJ);
-  #endif 
 
   if (frontendOptions.instrumentedParse)
     fortranOptions.instrumentedParse = true;
@@ -1825,47 +1785,10 @@ CompilerInvocation::getSemanticsCtx(
     const llvm::TargetMachine &targetMachine) {
   auto &fortranOptions = getFortranOpts();
 
-
-
-  #if 0
-    auto &moduleDirJ = getModuleDir();
-
-  auto triple = targetMachine.getTargetTriple();
-  llvm::SmallVector<std::string> searchDirectories{ llvm ::ArrayRef ( fortranOptions.searchDirectories))};
-    if (moduleDirJ != ".")
-      searchDirectories.emplace_back(moduleDirJ);
-
-    llvm::SmallVector<std::string> intrinsicModuleDirectories {  llvm::ArrayRef(fortranOptions.intrinsicModuleDirectories)};
-
-    // FIXME: Do not modify intrinsicIncludeDirs directly, should be treated as immutable just like argv.
-  // TODO: Normlize triple directory as clang does; best refactor with ToolChain::getDefaultIntrinsicModulePaths() used by the flang driver.
-    std::string mainExe = llvm::sys::fs::getMainExecutable(argv[0], nullptr);
-  llvm::StringRef prefixDir =   llvm::sys::path::parent_path( llvm::sys::path::parent_path(mainExe ));
-  llvm::SmallString<128> resourceDir (prefixDir);
-  llvm::sys::path::append(resourceDir, /*CLANG_INSTALL_LIBDIR_BASENAME*/ "lib", "clang", FLANG_VERSION_MAJOR_STRING);
-    llvm::sys::path::append(resourceDir,  "finclude", triple);
-    llvm::errs() << resourceDir << "\n";
-  intrinsicIncludeDirs.push_back(resourceDir.str().str());
-  
-  #endif 
-
-
   auto semanticsContext = std::make_unique<semantics::SemanticsContext>(
       getDefaultKinds(), fortranOptions.features, getLangOpts(),
       allCookedSources);
 
-#if 0
-    llvm::errs() << "\nsearch dirs:\n";
-  for (auto&& x : fortranOptions.searchDirectories) {
-  llvm::errs() << x << "\n";
-  }
-
-      llvm::errs() << "\nintrinsic search dirs:\n";
-  for (auto&& x : fortranOptions.intrinsicModuleDirectories) {
-  llvm::errs() << x << "\n";
-  }
-#endif 
-
   semanticsContext->set_moduleDirectory(getModuleDir())
       .set_searchDirectories(fortranOptions.searchDirectories)
       .set_intrinsicModuleDirectories(fortranOptions.intrinsicModuleDirectories)