[flang][driver] Move isFixedFormSuffix and isFreeFormSuffix to flangFrontend

[awarzynski]

Summary

As highlighted in the post-commit review:

• https://reviews.llvm.org/D94228,

isFixedFormSuffix and isFreeFormSuffix should be defined in
flangFrontend rather than flangFrontendTool library. That's for 2
reasons:

• these methods are used in flangFrontend rather than flangFrontendTool
• flangFrontendTool depends on flangFrontend

As mentioned on D94228, without this change shared library builds fails.

[FarisRehman]

I've built the latest main branch with -DBUILD_SHARED_LIBS=On and it failed. Applying this patch has resolved that.
Looks good to me.

flang/include/flang/Frontend/FrontendOptions.h

enum ActionKind {
 
   /// Emit a .o file.
   EmitObj,
 
   /// TODO: RunPreprocessor, EmitLLVM, EmitLLVMOnly,
   /// EmitCodeGenOnly, EmitAssembly, (...)
 };
 
+/// \param suffix The file extension
+/// \return True if the file extension should be processed as fixed form
+bool isFixedFormSuffix(llvm::StringRef suffix);
+
+/// \param suffix The file extension
+/// \return True if the file extension should be processed as free form
+bool isFreeFormSuffix(llvm::StringRef suffix);
+
 inline const char *GetActionKindName(const ActionKind ak) {
   switch (ak) {
   case InputOutputTest:
     return "InputOutputTest";
   case PrintPreprocessedInput:
     return "PrintPreprocessedInput";
   case ParseSyntaxOnly:
     return "ParseSyntaxOnly";

flang/include/flang/FrontendTool/Utils.h

 //===--- Utils.h - Misc utilities for the flang front-end --------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 //  This header contains miscellaneous utilities for various front-end actions
 //  which were split from Frontend to minimise Frontend's dependencies.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_FLANG_FRONTENDTOOL_UTILS_H
 #define LLVM_FLANG_FRONTENDTOOL_UTILS_H
 
-#include "llvm/ADT/StringRef.h"
-
 namespace Fortran::frontend {
 
 class CompilerInstance;
 class FrontendAction;
 
 /// Construct the FrontendAction of a compiler invocation based on the
 /// options specified for the compiler invocation.
 ///
 /// \return - The created FrontendAction object
 std::unique_ptr<FrontendAction> CreateFrontendAction(CompilerInstance &ci);
 
 /// ExecuteCompilerInvocation - Execute the given actions described by the
 /// compiler invocation object in the given compiler instance.
 ///
 /// \return - True on success.
 bool ExecuteCompilerInvocation(CompilerInstance *flang);
 
-/// \param suffix The file extension
-/// \return True if the file extension should be processed as fixed form
-bool isFixedFormSuffix(llvm::StringRef suffix);
-
-/// \param suffix The file extension
-/// \return True if the file extension should be processed as free form
-bool isFreeFormSuffix(llvm::StringRef suffix);
-
 } // end namespace Fortran::frontend
 
 #endif // LLVM_FLANG_FRONTENDTOOL_UTILS_H

flang/lib/Frontend/FrontendAction.cpp

 //===--- FrontendAction.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "flang/Frontend/FrontendAction.h"
 #include "flang/Frontend/CompilerInstance.h"
 #include "flang/Frontend/FrontendActions.h"
+#include "flang/Frontend/FrontendOptions.h"
 #include "flang/FrontendTool/Utils.h"
 #include "llvm/Support/Errc.h"
 
 using namespace Fortran::frontend;
 
 void FrontendAction::set_currentInput(const FrontendInputFile &currentInput) {
   this->currentInput_ = currentInput;
 }

flang/lib/Frontend/FrontendOptions.cpp

 //===- FrontendOptions.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "flang/Frontend/FrontendOptions.h"
-#include "flang/FrontendTool/Utils.h"
 
 using namespace Fortran::frontend;
 
+bool Fortran::frontend::isFixedFormSuffix(llvm::StringRef suffix) {
+  // Note: Keep this list in-sync with flang/test/lit.cfg.py
+  return suffix == "f" || suffix == "F" || suffix == "ff" || suffix == "for" ||
+      suffix == "FOR" || suffix == "fpp" || suffix == "FPP";
+}
+
+bool Fortran::frontend::isFreeFormSuffix(llvm::StringRef suffix) {
+  // Note: Keep this list in-sync with flang/test/lit.cfg.py
+  // TODO: Add Cuda Fortan files (i.e. `*.cuf` and `*.CUF`).
+  return suffix == "f77" || suffix == "f90" || suffix == "F90" ||
+      suffix == "ff90" || suffix == "f95" || suffix == "F95" ||
+      suffix == "ff95" || suffix == "f03" || suffix == "F03" ||
+      suffix == "f08" || suffix == "F08" || suffix == "f18" || suffix == "F18";
+}
+
 InputKind FrontendOptions::GetInputKindForExtension(llvm::StringRef extension) {
   if (isFixedFormSuffix(extension) || isFreeFormSuffix(extension)) {
     return Language::Fortran;
   }
   return Language::Unknown;
 }

flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp

bool ExecuteCompilerInvocation(CompilerInstance *flang) {
   std::unique_ptr<FrontendAction> act(CreateFrontendAction(*flang));
   if (!act)
     return false;
 
   bool success = flang->ExecuteAction(*act);
   return success;
 }
 
-bool isFixedFormSuffix(llvm::StringRef suffix) {
-  // Note: Keep this list in-sync with flang/test/lit.cfg.py
-  return suffix == "f" || suffix == "F" || suffix == "ff" || suffix == "for" ||
-      suffix == "FOR" || suffix == "fpp" || suffix == "FPP";
-}
-
-bool isFreeFormSuffix(llvm::StringRef suffix) {
-  // Note: Keep this list in-sync with flang/test/lit.cfg.py
-  // TODO: Add Cuda Fortan files (i.e. `*.cuf` and `*.CUF`).
-  return suffix == "f77" || suffix == "f90" || suffix == "F90" ||
-      suffix == "ff90" || suffix == "f95" || suffix == "F95" ||
-      suffix == "ff95" || suffix == "f03" || suffix == "F03" ||
-      suffix == "f08" || suffix == "F08" || suffix == "f18" || suffix == "F18";
-}
-
 } // namespace Fortran::frontend