[SYCL][NFC] Refactor clang driver by adding isObjectFile()

Adds isObjectFile() function, which is used to check if an input file is
an object by name (uses object file extension)

Signed-off-by: Michael D Toguchi <[email protected]>

Author: mdtoguchi

clang/include/clang/Driver/Driver.h

@@ -622,6 +622,9 @@ class Driver {
 /// And False otherwise.
 bool isOptimizationLevelFast(const llvm::opt::ArgList &Args);
 
+/// \return True if the filename has a valid object file extension.
+bool isObjectFile(std::string FileName);
+
 } // end namespace driver
 } // end namespace clang
 

clang/lib/Driver/Driver.cpp

@@ -3231,14 +3231,10 @@ class OffloadingActionBuilder final {
       if (auto *IA = dyn_cast<InputAction>(HostAction)) {
         SYCLDeviceActions.clear();
 
+        std::string InputName = IA->getInputArg().getValue();
         // Objects should already be consumed with -foffload-static-lib
-        const char * InputName = IA->getInputArg().getValue();
         if (Args.hasArg(options::OPT_foffload_static_lib_EQ) &&
-            HostAction->getType() == types::TY_Object &&
-            llvm::sys::path::has_extension(InputName) &&
-            types::lookupTypeForExtension(
-                llvm::sys::path::extension(InputName).drop_front()) ==
-                types::TY_Object)
+            IA->getType() == types::TY_Object && isObjectFile(InputName))
           return ABRT_Inactive;
 
         for (unsigned I = 0; I < ToolChains.size(); ++I)
@@ -3255,11 +3251,7 @@ class OffloadingActionBuilder final {
           // Check if the type of the file is the same as the action. Do not
           // unbundle it if it is not. Do not unbundle .so files, for example,
           // which are not object files.
-          if (IA->getType() == types::TY_Object &&
-              (!llvm::sys::path::has_extension(FileName) ||
-               types::lookupTypeForExtension(
-                 llvm::sys::path::extension(FileName).drop_front()) !=
-                 types::TY_Object))
+          if (IA->getType() == types::TY_Object && !isObjectFile(FileName))
             return ABRT_Inactive;
           // When creating FPGA device fat objects, all host objects are
           // partially linked.  Gather that list here.
@@ -3716,7 +3708,7 @@ class OffloadingActionBuilder final {
     if (CanUseBundler && isa<InputAction>(HostAction) &&
         InputArg->getOption().getKind() == llvm::opt::Option::InputClass &&
         !types::isSrcFile(HostAction->getType())) {
-      const char * InputName = InputArg->getValue();
+      std::string InputName = InputArg->getValue();
       // Do not create an unbundling action for an object when we know a fat
       // static library is being used.  A separate unbundling action is created
       // for all objects and the fat static library.
@@ -3728,10 +3720,7 @@ class OffloadingActionBuilder final {
       // for objects is still needed.
       if (C.getDefaultToolChain().getTriple().isWindowsMSVCEnvironment() ||
           !(HostAction->getType() == types::TY_Object &&
-            llvm::sys::path::has_extension(InputName) &&
-            types::lookupTypeForExtension(
-              llvm::sys::path::extension(InputName).drop_front()) ==
-              types::TY_Object &&
+            isObjectFile(InputName) &&
             Args.hasArg(options::OPT_foffload_static_lib_EQ))) {
         ActionList HostActionList;
         Action *A(HostAction);
@@ -3740,10 +3729,7 @@ class OffloadingActionBuilder final {
             HostAction->getType() != types::TY_FPGA_AOCR &&
             HostAction->getType() != types::TY_FPGA_AOCX &&
             !(HostAction->getType() == types::TY_Object &&
-              llvm::sys::path::has_extension(InputName) &&
-              types::lookupTypeForExtension(
-                  llvm::sys::path::extension(InputName).drop_front()) ==
-                  types::TY_Object)) {
+              isObjectFile(InputName))) {
           if (HasFPGADeviceBinary(C, InputArg->getAsString(Args), true))
             A = C.MakeAction<InputAction>(*InputArg, types::TY_FPGA_AOCX);
           else if (HasFPGADeviceBinary(C, InputArg->getAsString(Args)))
@@ -4162,10 +4148,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
       if (auto *IA = dyn_cast<InputAction>(LI)) {
         std::string FileName = IA->getInputArg().getAsString(Args);
         if (IA->getType() == types::TY_Object &&
-            (!llvm::sys::path::has_extension(FileName) ||
-             types::lookupTypeForExtension(
-               llvm::sys::path::extension(FileName).drop_front()) !=
-               types::TY_Object))
+            !isObjectFile(FileName))
           // Pass the Input along to linker.
           TempLinkerInputs.push_back(LI);
         else
@@ -5816,3 +5799,9 @@ bool clang::driver::isOptimizationLevelFast(const ArgList &Args) {
   return Args.hasFlag(options::OPT_Ofast, options::OPT_O_Group, false);
 }
 
+bool clang::driver::isObjectFile(std::string FileName) {
+  return (llvm::sys::path::has_extension(FileName) &&
+      types::lookupTypeForExtension(
+          llvm::sys::path::extension(FileName).drop_front()) ==
+          types::TY_Object);
+}