Revert "[NFC][clang][driver] Improve readability of long and complex if statement" while keeping the required underlying functional changes.

Author: mgcarrasco

clang/lib/Driver/Driver.cpp

@@ -5243,66 +5243,66 @@ Action *Driver::ConstructPhaseAction(
     return C.MakeAction<CompileJobAction>(Input, types::TY_LLVM_BC);
   }
   case phases::Backend: {
-    bool IsOffloadHIP = TargetDeviceOffloadKind == Action::OFK_HIP;
-    bool IsNewOffloadDriver =
-        Args.hasFlag(options::OPT_offload_new_driver,
-                     options::OPT_no_offload_new_driver, false);
     // Skip a redundant Backend phase for HIP device code when using the new
     // offload driver, where mid-end is done in linker wrapper.
-    if (IsOffloadHIP && IsNewOffloadDriver && !offloadDeviceOnly())
+    if (TargetDeviceOffloadKind == Action::OFK_HIP &&
+        Args.hasFlag(options::OPT_offload_new_driver,
+                     options::OPT_no_offload_new_driver, false) &&
+        !offloadDeviceOnly())
       return Input;
-    bool IsOffloadBuild = TargetDeviceOffloadKind != Action::OFK_None;
-    bool IsEmitLLVM = Args.hasArg(options::OPT_emit_llvm);
-    bool IsEmitAssembly = Args.hasArg(options::OPT_S);
-    if (isUsingLTO() && !IsOffloadBuild) {
+
+    if (isUsingLTO() && TargetDeviceOffloadKind == Action::OFK_None) {
       types::ID Output;
-      if (Args.hasArg(options::OPT_ffat_lto_objects) && !IsEmitLLVM)
+      if (Args.hasArg(options::OPT_ffat_lto_objects) &&
+          !Args.hasArg(options::OPT_emit_llvm))
         Output = types::TY_PP_Asm;
-      else if (IsEmitAssembly)
+      else if (Args.hasArg(options::OPT_S))
         Output = types::TY_LTO_IR;
       else
         Output = types::TY_LTO_BC;
       return C.MakeAction<BackendJobAction>(Input, Output);
     }
-    if (isUsingOffloadLTO() && IsOffloadBuild) {
-      types::ID Output = IsEmitAssembly ? types::TY_LTO_IR : types::TY_LTO_BC;
+    if (isUsingOffloadLTO() && TargetDeviceOffloadKind != Action::OFK_None) {
+      types::ID Output =
+          Args.hasArg(options::OPT_S) ? types::TY_LTO_IR : types::TY_LTO_BC;
       return C.MakeAction<BackendJobAction>(Input, Output);
     }
-
-    bool IsOffloadSYCL = TargetDeviceOffloadKind == Action::OFK_SYCL;
-    auto OffloadingToolChain = Input->getOffloadingToolChain();
-    bool IsOffloadAMDGPU = OffloadingToolChain &&
-                           OffloadingToolChain->getTriple().isAMDGPU() &&
-                           IsOffloadBuild;
-    bool IsRDC =
-        Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false);
-    bool IsSPIRV =
-        OffloadingToolChain && OffloadingToolChain->getTriple().isSPIRV();
-    bool IsOffloadOpenMP = TargetDeviceOffloadKind == Action::OFK_OpenMP;
-
-    bool IsHIP = TargetDeviceOffloadKind == Action::OFK_HIP;
     bool UseSPIRVBackend = Args.hasFlag(options::OPT_use_spirv_backend,
                                         options::OPT_no_use_spirv_backend,
                                         /*Default=*/false);
-    // If offloadDeviceOnly(), we call the SPIRV backend unless LLVM bitcode was
-    // requested explicitly or RDC is set. If !offloadDeviceOnly, we emit LLVM
-    // bitcode, and clang-linker-wrapper will compile it to SPIRV.
-    bool UseSPIRVBackendForHipDeviceOnlyNoRDC =
-        IsHIP && IsSPIRV && UseSPIRVBackend && offloadDeviceOnly() && !IsRDC;
-
-    bool IsLLVMBitcodeOutput =
-        IsEmitLLVM || IsOffloadSYCL ||
-        ((IsOffloadAMDGPU || IsOffloadHIP) &&
-         !UseSPIRVBackendForHipDeviceOnlyNoRDC &&
-         ((IsRDC || (IsNewOffloadDriver &&
-                     (!offloadDeviceOnly() || (IsOffloadHIP && IsSPIRV)))) ||
-          IsOffloadOpenMP));
 
-    if (IsLLVMBitcodeOutput) {
+    auto OffloadingToolChain = Input->getOffloadingToolChain();
+    // For AMD SPIRV, if offloadDeviceOnly(), we call the SPIRV backend unless
+    // LLVM bitcode was requested explicitly or RDC is set. If
+    // !offloadDeviceOnly, we emit LLVM bitcode, and clang-linker-wrapper will
+    // compile it to SPIRV.
+    bool UseSPIRVBackendForHipDeviceOnlyNoRDC =
+        TargetDeviceOffloadKind == Action::OFK_HIP && OffloadingToolChain &&
+        OffloadingToolChain->getTriple().isSPIRV() && UseSPIRVBackend &&
+        offloadDeviceOnly() &&
+        !Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false);
+
+    if (Args.hasArg(options::OPT_emit_llvm) ||
+        TargetDeviceOffloadKind == Action::OFK_SYCL ||
+        (((Input->getOffloadingToolChain() &&
+           Input->getOffloadingToolChain()->getTriple().isAMDGPU() &&
+           TargetDeviceOffloadKind != Action::OFK_None) ||
+          TargetDeviceOffloadKind == Action::OFK_HIP) &&
+         UseSPIRVBackendForHipDeviceOnlyNoRDC &&
+         ((Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
+                        false) ||
+           (Args.hasFlag(options::OPT_offload_new_driver,
+                         options::OPT_no_offload_new_driver, false) &&
+            (!offloadDeviceOnly() ||
+             (Input->getOffloadingToolChain() &&
+              TargetDeviceOffloadKind == Action::OFK_HIP &&
+              Input->getOffloadingToolChain()->getTriple().isSPIRV())))) ||
+          TargetDeviceOffloadKind == Action::OFK_OpenMP))) {
       types::ID Output =
-          IsEmitAssembly &&
-                  (!IsOffloadBuild || offloadDeviceOnly() ||
-                   (IsOffloadHIP &&
+          Args.hasArg(options::OPT_S) &&
+                  (TargetDeviceOffloadKind == Action::OFK_None ||
+                   offloadDeviceOnly() ||
+                   (TargetDeviceOffloadKind == Action::OFK_HIP &&
                     !Args.hasFlag(options::OPT_offload_new_driver,
                                   options::OPT_no_offload_new_driver,
                                   C.isOffloadingHostKind(Action::OFK_Cuda))))