Commit 133a7e63 authored by Alexandre Ganea's avatar Alexandre Ganea
Browse files

[PATCH] Reland [Clang] Un-break scan-build after integrated-cc1 change 

The issue was reported by @xazax.hun here: https://reviews.llvm.org/D69825#1827826

"This patch (D69825) breaks scan-build-py which parses the output of "-###" to get -cc1 command. There might be other tools with the same problems. Could we either remove (in-process) from CC1Command::Print or add a line break?

Having the last line as a valid invocation is valuable and there might be tools relying on that."

Differential Revision: https://reviews.llvm.org/D72982
parent 9a5a6e94

clang/lib/Driver/Compilation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int Compilation::ExecuteCommand(const Command &C, 
    }



    if (getDriver().CCPrintOptions)

      *OS << "[Logging clang options]";

      *OS << "[Logging clang options]\n";



    C.Print(*OS, "\n", /*Quote=*/getDriver().CCPrintOptions);

  }

clang/lib/Driver/Job.cpp

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ int Command::Execute(ArrayRef<llvm::Optional<StringRef>> Redirects, 


void CC1Command::Print(raw_ostream &OS, const char *Terminator, bool Quote,

                       CrashReportInfo *CrashInfo) const {

  OS << " (in-process)";

  OS << " (in-process)\n";

  Command::Print(OS, Terminator, Quote, CrashInfo);

}

clang/test/Driver/cc-print-options.c

+2 −1
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ 
// RUN: %clang -no-canonical-prefixes -S -o %t.s %s

// RUN: FileCheck %s < %t.log



// CHECK: [Logging clang options]{{.*}}clang{{.*}}"-S"

// CHECK: [Logging clang options]

// CHECK: {{.*}}clang{{.*}}"-S"

clang/test/Driver/cuda-simple.cu

+2 −2
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ 
// Verify that we pass -x cuda-cpp-output to compiler after

// preprocessing a CUDA file

// RUN: %clang  -Werror -### -save-temps -c %s 2>&1 | FileCheck %s

// CHECK: "-cc1"

// CHECK-LABEL: "-cc1"

// CHECK: "-E"

// CHECK: "-x" "cuda"

// CHECK-NEXT: "-cc1"

// CHECK-LABEL: "-cc1"

// CHECK: "-x" "cuda-cpp-output"

//

// Verify that compiler accepts CUDA syntax with "-x cuda-cpp-output".

clang/test/Driver/offloading-interoperability.c

+2 −2
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
// RUN: %clang -no-canonical-prefixes -### -x cuda -target powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 -fopenmp=libomp %s 2>&1 \

// RUN: | FileCheck %s --check-prefix NO-OPENMP-FLAGS-FOR-CUDA-DEVICE

//

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE:      clang{{.*}}" "-cc1" "-triple" "nvptx64-nvidia-cuda"

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-LABEL:clang{{.*}}" "-cc1" "-triple" "nvptx64-nvidia-cuda"

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NOT:  -fopenmp

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: ptxas" "-m64"

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: fatbinary"{{( "--cuda")?}} "-64"

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: clang{{.*}}" "-cc1" "-triple" "powerpc64le-unknown-linux-gnu"

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-LABEL:clang{{.*}}" "-cc1" "-triple" "powerpc64le-unknown-linux-gnu"

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE:      -fopenmp

// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: {{ld(.exe)?"}} {{.*}}"-m" "elf64lppc"