start cleanup

Author: Meinersbur

clang/include/clang/Driver/ToolChain.h

@@ -158,10 +158,6 @@ class ToolChain {
   /// The list of toolchain specific path prefixes to search for programs.
   path_list ProgramPaths;
 
-  #if 0
-    path_list IntrinsicModulePaths;
-    #endif 
-
   mutable std::unique_ptr<Tool> Clang;
   mutable std::unique_ptr<Tool> Flang;
   mutable std::unique_ptr<Tool> Assemble;
@@ -193,8 +189,7 @@ class ToolChain {
     EffectiveTriple = std::move(ET);
   }
 
-  std::optional<std::string>
-  getFallbackAndroidTargetPath(StringRef BaseDir) const;
+
 
   mutable std::optional<CXXStdlibType> cxxStdlibType;
   mutable std::optional<RuntimeLibType> runtimeLibType;
@@ -307,12 +302,6 @@ class ToolChain {
   path_list &getProgramPaths() { return ProgramPaths; }
   const path_list &getProgramPaths() const { return ProgramPaths; }
 
-  #if 0
-    path_list &getIntrinsicModulePaths() { return IntrinsicModulePaths; }
-  const path_list &getIntrinsicModulePaths() const { return IntrinsicModulePaths; }
-  #endif 
-
-
   const MultilibSet &getMultilibs() const { return Multilibs; }
 
   const llvm::SmallVector<Multilib> &getSelectedMultilibs() const {
@@ -550,11 +539,15 @@ class ToolChain {
                                     StringRef Component,
                                     FileType Type = ToolChain::FT_Static) const;
 
-  // Returns Triple without the OSs version.
-  static llvm::Triple getTripleWithoutOSVersion(const llvm::Triple &T) ;
 
+
+ /// Returns the target-specific path for Flang's intrinsic modules in the resource directory if it exists.
+/// @{
   static std::optional<std::string>  getDefaultIntrinsicModuleDir(StringRef resourceDir,  const llvm::Triple &T ,llvm::vfs::FileSystem &VFS, clang::DiagnosticsEngine *Diags  );
+
+ 
     std::optional<std::string>  getDefaultIntrinsicModuleDir(  ) const;
+/// @}
 
   // Returns the target specific runtime path if it exists.
   std::optional<std::string> getRuntimePath() const;

clang/lib/Driver/Driver.cpp

@@ -6538,7 +6538,7 @@ std::string Driver::GetFilePath(StringRef Name, const ToolChain &TC) const {
     return std::string(P);
 
     if (IsFlangMode()) {
-      if (auto IntrPath =   TC.getDefaultIntrinsicModuleDir ()) {
+      if (std::optional<std::string> IntrPath =   TC.getDefaultIntrinsicModuleDir ()) {
           SmallString<128> P(*IntrPath);
   llvm::sys::path::append(P, Name);
   if (llvm::sys::fs::exists(Twine(P)))

clang/lib/Driver/ToolChain.cpp

@@ -102,15 +102,8 @@ ToolChain::ToolChain(const Driver &D, const llvm::Triple &T,
     getFilePaths().push_back(*Path);
   for (const auto &Path : getArchSpecificLibPaths())
     addIfExists(getFilePaths(), Path);
-
-  #if 0
-    if (std::optional<std::string> Path = getDefaultIntrinsicModuleDir())
-      getIntrinsicModulePaths().push_back(*Path);
-    #endif 
 }
 
-
-
 llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>>
 ToolChain::executeToolChainProgram(StringRef Executable) const {
   llvm::SmallString<64> OutputFile;
@@ -916,51 +909,12 @@ getFallbackAndroidTargetPath(StringRef BaseDir, const llvm::Triple &T, llvm::vfs
   return std::string(P);
 }
 
-std::optional<std::string>
-ToolChain::getFallbackAndroidTargetPath(StringRef BaseDir) const {
-  return ::getFallbackAndroidTargetPath(BaseDir, getTriple(), getVFS(), &D.getDiags());
-  #if 0
-  llvm::Triple TripleWithoutLevel(getTriple());
-  TripleWithoutLevel.setEnvironmentName("android"); // remove any version number
-  const std::string &TripleWithoutLevelStr = TripleWithoutLevel.str();
-  unsigned TripleVersion = getTriple().getEnvironmentVersion().getMajor();
-  unsigned BestVersion = 0;
-
-  SmallString<32> TripleDir;
-  bool UsingUnversionedDir = false;
-  std::error_code EC;
-  for (llvm::vfs::directory_iterator LI = getVFS().dir_begin(BaseDir, EC), LE;
-       !EC && LI != LE; LI = LI.increment(EC)) {
-    StringRef DirName = llvm::sys::path::filename(LI->path());
-    StringRef DirNameSuffix = DirName;
-    if (DirNameSuffix.consume_front(TripleWithoutLevelStr)) {
-      if (DirNameSuffix.empty() && TripleDir.empty()) {
-        TripleDir = DirName;
-        UsingUnversionedDir = true;
-      } else {
-        unsigned Version;
-        if (!DirNameSuffix.getAsInteger(10, Version) && Version > BestVersion &&
-            Version < TripleVersion) {
-          BestVersion = Version;
-          TripleDir = DirName;
-          UsingUnversionedDir = false;
-        }
-      }
-    }
-  }
 
-  if (TripleDir.empty())
-    return {};
 
-  SmallString<128> P(BaseDir);
-  llvm::sys::path::append(P, TripleDir);
-  if (UsingUnversionedDir)
-    D.Diag(diag::warn_android_unversioned_fallback) << P << getTripleString();
-  return std::string(P);
-  #endif 
-}
 
-llvm::Triple ToolChain::getTripleWithoutOSVersion(const llvm::Triple &Triple)  {
+   /// Returns Triple without the OSs version.
+static 
+llvm::Triple getTripleWithoutOSVersion(const llvm::Triple &Triple)  {
   return (Triple.hasEnvironment()
               ? llvm::Triple(Triple.getArchName(), Triple.getVendorName(),
                              llvm::Triple::getOSTypeName(Triple.getOS()),
@@ -979,7 +933,6 @@ static std::optional<std::string> getTargetSubDirPath(StringRef BaseDir,   const
     return {};
   };
 
-
   if (auto Path = getPathForTriple(T))
     return *Path;
 
@@ -991,7 +944,7 @@ static std::optional<std::string> getTargetSubDirPath(StringRef BaseDir,   const
                                llvm::Triple::getOSTypeName(T.getOS()));
     } else {
       // Strip the OS version from the triple.
-      AIXTriple =ToolChain:: getTripleWithoutOSVersion(T);
+      AIXTriple =getTripleWithoutOSVersion(T);
     }
     if (auto Path = getPathForTriple(AIXTriple))
       return *Path;
@@ -1000,7 +953,7 @@ static std::optional<std::string> getTargetSubDirPath(StringRef BaseDir,   const
   if (T.isOSzOS() &&
       (!T.getOSVersion().empty() || !T.getEnvironmentVersion().empty())) {
     // Build the triple without version information
-    const llvm::Triple &TripleWithoutVersion =ToolChain:: getTripleWithoutOSVersion(T);
+    const llvm::Triple &TripleWithoutVersion =getTripleWithoutOSVersion(T);
     if (auto Path = getPathForTriple(TripleWithoutVersion))
       return *Path;
   }
@@ -1028,7 +981,7 @@ static std::optional<std::string> getTargetSubDirPath(StringRef BaseDir,   const
   }
 
   if (T.isAndroid())
-    return :: getFallbackAndroidTargetPath(BaseDir, T, VFS, Diags);
+    return getFallbackAndroidTargetPath(BaseDir, T, VFS, Diags);
 
   return {};
 }
@@ -1037,77 +990,12 @@ static std::optional<std::string> getTargetSubDirPath(StringRef BaseDir,   const
 std::optional<std::string>
 ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
   return ::getTargetSubDirPath(BaseDir, getTriple(), getVFS(),& D.getDiags() );
-  #if 0
-  auto getPathForTriple =
-      [&](const llvm::Triple &Triple) -> std::optional<std::string> {
-    SmallString<128> P(BaseDir);
-    llvm::sys::path::append(P, Triple.str());
-    if (getVFS().exists(P))
-      return std::string(P);
-    return {};
-  };
-
-  const llvm::Triple &T = getTriple();
-  if (auto Path = getPathForTriple(T))
-    return *Path;
-
-  if (T.isOSAIX()) {
-    llvm::Triple AIXTriple;
-    if (T.getEnvironment() == Triple::UnknownEnvironment) {
-      // Strip unknown environment and the OS version from the triple.
-      AIXTriple = llvm::Triple(T.getArchName(), T.getVendorName(),
-                               llvm::Triple::getOSTypeName(T.getOS()));
-    } else {
-      // Strip the OS version from the triple.
-      AIXTriple = getTripleWithoutOSVersion();
-    }
-    if (auto Path = getPathForTriple(AIXTriple))
-      return *Path;
-  }
-
-  if (T.isOSzOS() &&
-      (!T.getOSVersion().empty() || !T.getEnvironmentVersion().empty())) {
-    // Build the triple without version information
-    const llvm::Triple &TripleWithoutVersion = getTripleWithoutOSVersion();
-    if (auto Path = getPathForTriple(TripleWithoutVersion))
-      return *Path;
-  }
-
-  // When building with per target runtime directories, various ways of naming
-  // the Arm architecture may have been normalised to simply "arm".
-  // For example "armv8l" (Armv8 AArch32 little endian) is replaced with "arm".
-  // Since an armv8l system can use libraries built for earlier architecture
-  // versions assuming endian and float ABI match.
-  //
-  // Original triple: armv8l-unknown-linux-gnueabihf
-  //  Runtime triple: arm-unknown-linux-gnueabihf
-  //
-  // We do not do this for armeb (big endian) because doing so could make us
-  // select little endian libraries. In addition, all known armeb triples only
-  // use the "armeb" architecture name.
-  //
-  // M profile Arm is bare metal and we know they will not be using the per
-  // target runtime directory layout.
-  if (T.getArch() == Triple::arm && !T.isArmMClass()) {
-    llvm::Triple ArmTriple = T;
-    ArmTriple.setArch(Triple::arm);
-    if (auto Path = getPathForTriple(ArmTriple))
-      return *Path;
-  }
-
-  if (T.isAndroid())
-    return getFallbackAndroidTargetPath(BaseDir);
-
-  return {};
-  #endif 
 }
 
  std::optional< std::string> ToolChain::getDefaultIntrinsicModuleDir(StringRef ResourceDir,  const llvm::Triple &T ,llvm::vfs::FileSystem &VFS, clang::DiagnosticsEngine *Diags  ) {
   SmallString<128> P(ResourceDir);
   llvm::sys::path::append(P, "finclude");
   return   ::getTargetSubDirPath(P, T, VFS, Diags );
- //   llvm::sys::path::append(instrinsicsDir,  "finclude", triple.str());
- //   return instrinsicsDir.str().str();
 }
 
   std::optional< std::string> ToolChain::getDefaultIntrinsicModuleDir(  ) const {

flang/include/flang/Frontend/CompilerInvocation.h

@@ -92,13 +92,13 @@ class CompilerInvocation : public CompilerInvocationBase {
   // intrinsic of iso_fortran_env.
   std::string allCompilerInvocOpts;
 
-  /// Location of the resource directory containing files specific to this instance of Flang.
+  /// Location of the resource directory containing files specific to this instance/version of Flang.
   std::string resourceDir;
 
   /// Semantic options
   // TODO: Merge with or translate to frontendOpts. We shouldn't need two sets
   // of options.
- std::string moduleDir = "."; // MK: even used?
+  std::string moduleDir = ".";
 
   std::string moduleFileSuffix = ".mod";
 
@@ -184,10 +184,9 @@ class CompilerInvocation : public CompilerInvocationBase {
   const std::string &getResourceDir() const { return resourceDir; }
 
 
-#if 1
+
   std::string &getModuleDir() { return moduleDir; }
   const std::string &getModuleDir() const { return moduleDir; }
-#endif 
 
   std::string &getModuleFileSuffix() { return moduleFileSuffix; }
   const std::string &getModuleFileSuffix() const { return moduleFileSuffix; }
@@ -262,10 +261,7 @@ class CompilerInvocation : public CompilerInvocationBase {
   /// Useful setters
   void setArgv0(const char *dir) { argv0 = dir; }
 
-
-  void setModuleDir(std::string &dir) { 
-moduleDir = dir; 
-}
+  void setModuleDir(std::string &dir) { moduleDir = dir; }
 
   void setModuleFileSuffix(const char *suffix) {
     moduleFileSuffix = std::string(suffix);

flang/include/flang/Frontend/PreprocessorOptions.h

@@ -45,10 +45,6 @@ struct PreprocessorOptions {
   // consider collecting them in a separate aggregate. For now we keep it here
   // as there is no point creating a class for just one field.
   std::vector<std::string> searchDirectoriesFromDashI;
-
-  // Search directories specified by the user with -J (and -module-dir?)
-  std::vector<std::string> searchDirectoriesFromDashJ;
-
   // Search directories specified by the user with -fintrinsic-modules-path
   std::vector<std::string> searchDirectoriesFromIntrModPath;
 

flang/include/flang/Parser/options.h

@@ -23,14 +23,16 @@ struct Options {
 
   using Predefinition = std::pair<std::string, std::optional<std::string>>;
 
-  bool isFixedForm{false}; 
+  bool isFixedForm{false};
   int fixedFormColumns{72};
   common::LanguageFeatureControl features;
 
-  /// -J
+  /// Search paths from -J/-module-dir
+  /// Only a single path is supported which is also the location for writing modules.
   std::vector<std::string> searchDirectories;
 
-   /// -fintrinsic-modules-path 
+  /// Search paths from -fintrinsic-modules-path
+  /// Muliple paths are supported.
   std::vector<std::string> intrinsicModuleDirectories; 
 
   std::vector<Predefinition> predefinitions;

flang/include/flang/Parser/parse-tree.h

@@ -3357,27 +3357,9 @@ struct StmtFunctionStmt {
 // !DIR$ NOUNROLL_AND_JAM
 // !DIR$ <anything else>
 struct CompilerDirective {
-  template <typename A, typename = common::NoLvalue<A>>
-  CompilerDirective(A &&x) : u(std::move(x)) {
-  int a = 0;
-  }
-  using UnionTrait = std::true_type;
-  CompilerDirective(CompilerDirective &&) = default;
-  CompilerDirective &operator=(CompilerDirective &&) = default;
-  CompilerDirective(const CompilerDirective &) = delete;
-  CompilerDirective &operator=(const CompilerDirective &) = delete;
-  CompilerDirective() = delete;
+  UNION_CLASS_BOILERPLATE(CompilerDirective);
   struct IgnoreTKR {
-    template <typename... Ts, typename = common::NoLvalue<Ts...>>
-    IgnoreTKR(Ts &&...args) : t(std::move(args)...) {
-    int b = 0;
-    }
-    using TupleTrait = std::true_type;
-    IgnoreTKR(IgnoreTKR &&) = default;
-    IgnoreTKR &operator=(IgnoreTKR &&) = default;
-    IgnoreTKR(const IgnoreTKR &) = delete;
-    IgnoreTKR &operator=(const IgnoreTKR &) = delete;
-    IgnoreTKR() = delete;
+    TUPLE_CLASS_BOILERPLATE(IgnoreTKR);
     std::tuple<std::optional<std::list<const char *>>, Name> t;
   };
   struct LoopCount {

flang/include/flang/Parser/provenance.h

@@ -188,7 +188,7 @@ class AllSources {
   ProvenanceRange IntersectionWithSourceFiles(ProvenanceRange) const;
   llvm::raw_ostream &Dump(llvm::raw_ostream &) const;
 
-public:
+private:
   struct Inclusion {
     const SourceFile &source;
     bool isModule{false};

flang/include/flang/Semantics/semantics.h

@@ -316,13 +316,16 @@ class SemanticsContext {
   parser::AllCookedSources &allCookedSources_;
   std::optional<parser::CharBlock> location_;
 
-  // -J
+  /// Search paths for non-intrinsic modules. 
+  /// Originates from the -J/-module-dir command line options
   std::vector<std::string> searchDirectories_;
 
-  // -fintrinsic_modules_path 
+  /// Search paths for intrinsic modules.
+  /// Originates from the -fintrinsic-modules-path line option
   std::vector<std::string> intrinsicModuleDirectories_;
 
-  // -module-dir ???
+  /// Location for emitting module files.
+    /// Originates from the -J/-module-dir command line options
   std::string moduleDirectory_{"."s};
 
   std::string moduleFileSuffix_{".mod"};
@@ -379,7 +382,7 @@ class Semantics {
   void EmitMessages(llvm::raw_ostream &);
   void DumpSymbols(llvm::raw_ostream &);
   void DumpSymbolsSources(llvm::raw_ostream &) const;
-  bool intrinsicsMode_ = false;
+
 private:
   SemanticsContext &context_;
   parser::Program &program_;