[Clang][Driver] Fix condition in combineBackendCompile when using -no-integrated-cpp

When using -no-integrated-cpp, before, the driver won't collapse actions when the input was not llvm-ir
or it would collapse them aggresively with -save-temps

Author: jmmartinez

clang/lib/Driver/Driver.cpp

@@ -5609,19 +5609,20 @@ class ToolSelector final {
     if (!BJ || !CJ)
       return nullptr;
 
+    auto HasBitcodeInput = [](const JobActionInfo &AI) {
+      for (auto &Input : AI.JA->getInputs())
+        if (!types::isLLVMIR(Input->getType()))
+          return false;
+      return true;
+    };
+
     // Check if the initial input (to the compile job or its predessor if one
     // exists) is LLVM bitcode. In that case, no preprocessor step is required
     // and we can still collapse the compile and backend jobs when we have
     // -save-temps. I.e. there is no need for a separate compile job just to
     // emit unoptimized bitcode.
-    bool InputIsBitcode = true;
-    for (size_t i = 1; i < ActionInfo.size(); i++)
-      if (ActionInfo[i].JA->getType() != types::TY_LLVM_BC &&
-          ActionInfo[i].JA->getType() != types::TY_LTO_BC) {
-        InputIsBitcode = false;
-        break;
-      }
-    if (!InputIsBitcode && !canCollapsePreprocessorAction())
+    bool InputIsBitcode = all_of(ActionInfo, HasBitcodeInput);
+    if (SaveTemps && !InputIsBitcode)
       return nullptr;
 
     // Get compiler tool.
@@ -5635,7 +5636,7 @@ class ToolSelector final {
     if (!T->hasIntegratedBackend() && !(OutputIsLLVM && T->canEmitIR()))
       return nullptr;
 
-    if (T->canEmitIR() && ((SaveTemps && !InputIsBitcode) || EmbedBitcode))
+    if (T->canEmitIR() && EmbedBitcode)
       return nullptr;
 
     Inputs = CJ->getInputs();

clang/test/Driver/no-integrated-cpp.c

@@ -33,11 +33,14 @@
 //
 // RUN: %clang -O2 %t.i  -c -o a.o -no-integrated-cpp -save-temps -### 2>&1 | FileCheck %s --check-prefixes=PRE-SAVE
 // PRE-SAVE-NOT: "-E"
-// PRE-SAVE-NOT: "-emit-llvm-bc"
-// PRE-SAVE: "-S"
-// PRE-SAVE-SAME: "-o" "[[ASM:.*.s]]"
+// PRE-SAVE: "-emit-llvm-bc"
+// PRE-SAVE-SAME: "-o" "[[BITCODE:.*.bc]]"
 // PRE-SAVE-SAME: "-x" "cpp-output" "{{.*}}no-integrated-cpp.c.tmp.i"
 //
+// PRE-SAVE-NEXT: "-S"
+// PRE-SAVE-SAME: "-o" "[[ASM:.*.s]]"
+// PRE-SAVE-SAME: "-x" "ir" "[[BITCODE]]"
+//
 // PRE-SAVE-NEXT: "-cc1as"
 // PRE-SAVE-SAME: "-o" "a.o" "[[ASM]]"
 //
@@ -47,12 +50,8 @@
 // LLVM-SAME: "-x" "c" "{{.*}}no-integrated-cpp.c"
 //
 // LLVM-NEXT: "-emit-llvm-bc"
-// LLVM-SAME: "-o" "[[BITCODE:.*.bc]]"
-// LLVM-SAME: "-x" "cpp-output" "[[PREPROC]]"
-//
-// LLVM-NEXT: "-emit-llvm-bc"
 // LLVM-SAME: "-o" "a.bc"
-// LLVM-SAME: "-x" "ir" "[[BITCODE]]"
+// LLVM-SAME: "-x" "cpp-output" "[[PREPROC]]"
 //
 // RUN: %clang -O2 %s -c -emit-llvm -o a.bc -no-integrated-cpp -save-temps -### 2>&1 | FileCheck %s --check-prefixes=LLVM-SAVE
 // LLVM-SAVE: "-E"
@@ -76,5 +75,9 @@
 // RUN: %clang -O2 %t.i -c -emit-llvm -o a.bc -no-integrated-cpp -save-temps -### 2>&1 | FileCheck %s --check-prefixes=PRE-LLVM-SAVE
 // PRE-LLVM-SAVE-NOT: "-E"
 // PRE-LLVM-SAVE: "-emit-llvm-bc"
-// PRE-LLVM-SAVE-SAME: "-o" "a.bc"
+// PRE-LLVM-SAVE-SAME: "-o" "[[BITCODE:.*.bc]]"
 // PRE-LLVM-SAVE-SAME: "-x" "cpp-output" "{{.*}}no-integrated-cpp.c.tmp.i"
+
+// PRE-LLVM-SAVE-NEXT: "-emit-llvm-bc"
+// PRE-LLVM-SAVE-SAME: "-o" "a.bc"
+// PRE-LLVM-SAVE-SAME: "-x" "ir" "[[BITCODE]]"