From: Samuel Antao Date: Thu, 27 Oct 2016 00:53:34 +0000 (+0000) Subject: Fix bug when compiling CUDA code with -emit-llvm and -o. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b40469bc6c55cbaa6e0b17cda325d375b0b3572b;p=clang Fix bug when compiling CUDA code with -emit-llvm and -o. In this case the device code is not injected into an host action and therefore the user should get an error as -o can't be used when generating two outputs. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@285263 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index f2ee1ca5c8..4335bbfd42 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1611,6 +1611,11 @@ class OffloadingActionBuilder final { // We avoid creating host action in device-only mode. return CompileDeviceOnly ? ABRT_Ignore_Host : ABRT_Success; + } else if (CurPhase > phases::Backend) { + // If we are past the backend phase and still have a device action, we + // don't have to do anything as this action is already a device + // top-level action. + return ABRT_Success; } assert(CurPhase < phases::Backend && "Generating single CUDA " diff --git a/test/Driver/cuda-output-asm.cu b/test/Driver/cuda-output-asm.cu index af62478ac2..af066ce568 100644 --- a/test/Driver/cuda-output-asm.cu +++ b/test/Driver/cuda-output-asm.cu @@ -1,4 +1,4 @@ -// Tests CUDA compilation with -S. +// Tests CUDA compilation with -S and -emit-llvm. // REQUIRES: clang-driver // REQUIRES: x86-registered-target @@ -26,4 +26,6 @@ // RUN: %clang -### -S -target x86_64-linux-gnu --cuda-device-only \ // RUN: --cuda-gpu-arch=sm_20 --cuda-gpu-arch=sm_30 -o foo.s %s 2>&1 \ // RUN: | FileCheck -check-prefix MULTIPLE-OUTPUT-FILES %s +// RUN: %clang -### -emit-llvm -c -target x86_64-linux-gnu -o foo.s %s 2>&1 \ +// RUN: | FileCheck -check-prefix MULTIPLE-OUTPUT-FILES %s // MULTIPLE-OUTPUT-FILES: error: cannot specify -o when generating multiple output files