Author: Alexandre Ganea Date: 2020-01-21T16:06:36-05:00 New Revision: b0b2b7e09926cdde4d82978a7c14b5e2d38db35c
URL: https://github.com/llvm/llvm-project/commit/b0b2b7e09926cdde4d82978a7c14b5e2d38db35c DIFF: https://github.com/llvm/llvm-project/commit/b0b2b7e09926cdde4d82978a7c14b5e2d38db35c.diff LOG: Revert "[Clang] Un-break scan-build after integrated-cc1 change" This reverts commit a6883017ea9af529e89d7f89af2477378b6eafca. Added: Modified: clang/lib/Driver/Job.cpp clang/test/Driver/cuda-simple.cu clang/test/Driver/offloading-interoperability.c clang/test/Driver/option-aliases.c Removed: ################################################################################ diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp index 7dab2a022d92..d57c3a1cdbb8 100644 --- a/clang/lib/Driver/Job.cpp +++ b/clang/lib/Driver/Job.cpp @@ -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)\n"; + OS << " (in-process)"; Command::Print(OS, Terminator, Quote, CrashInfo); } diff --git a/clang/test/Driver/cuda-simple.cu b/clang/test/Driver/cuda-simple.cu index 54e18403108b..b6840be4e2e5 100644 --- a/clang/test/Driver/cuda-simple.cu +++ b/clang/test/Driver/cuda-simple.cu @@ -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-LABEL: "-cc1" +// CHECK: "-cc1" // CHECK: "-E" // CHECK: "-x" "cuda" -// CHECK-LABEL: "-cc1" +// CHECK-NEXT: "-cc1" // CHECK: "-x" "cuda-cpp-output" // // Verify that compiler accepts CUDA syntax with "-x cuda-cpp-output". diff --git a/clang/test/Driver/offloading-interoperability.c b/clang/test/Driver/offloading-interoperability.c index c3a72f0dfe2a..9c80d91d1d78 100644 --- a/clang/test/Driver/offloading-interoperability.c +++ b/clang/test/Driver/offloading-interoperability.c @@ -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-LABEL:clang{{.*}}" "-cc1" "-triple" "nvptx64-nvidia-cuda" +// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE: 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-LABEL:clang{{.*}}" "-cc1" "-triple" "powerpc64le-unknown-linux-gnu" +// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: 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" diff --git a/clang/test/Driver/option-aliases.c b/clang/test/Driver/option-aliases.c index e50289cc3bdf..9cd9252a4832 100644 --- a/clang/test/Driver/option-aliases.c +++ b/clang/test/Driver/option-aliases.c @@ -3,12 +3,12 @@ // RUN: --param=FOO --output=FOO %s 2>&1 | \ // RUN: FileCheck %s -// CHECK-LABEL: "-cc1" +// CHECK: "-cc1" // CHECK: "-E" // CHECK: "-U" "FOO" // CHECK: "-U" "BAR" // CHECK: "-o" "option-aliases.i" -// CHECK-LABEL: "-cc1" +// CHECK-NEXT: "-cc1" // CHECK: "-S" // CHECK: "-o" "FOO" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
