diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2014-05-29 16:39:42 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2014-05-29 16:39:42 +0000 |
| commit | a670c20894c6c8881a8be958a69aaa25e8df31e4 (patch) | |
| tree | 4420fa6afb9c33e1082f3530c897bdd5cf1e703a | |
| parent | 9c89ff1945784b9dd121c155a4510d9e9e63577a (diff) | |
| download | bcm5719-llvm-a670c20894c6c8881a8be958a69aaa25e8df31e4.tar.gz bcm5719-llvm-a670c20894c6c8881a8be958a69aaa25e8df31e4.zip | |
No longer allow the -std options to entirely override the -x language option. This allows -x cuda -std=c++11, for instance.
llvm-svn: 209824
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 16 | ||||
| -rw-r--r-- | clang/test/Frontend/stdlang.c | 9 | ||||
| -rw-r--r-- | clang/test/Index/attributes-cuda.cu | 3 |
3 files changed, 15 insertions, 13 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 2ba9450c0f2..1ed24a7e438 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1114,18 +1114,13 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK, Opts.ImplicitInt = Std.hasImplicitInt(); // Set OpenCL Version. - if (LangStd == LangStandard::lang_opencl) { - Opts.OpenCL = 1; + Opts.OpenCL = LangStd == LangStandard::lang_opencl || IK == IK_OpenCL; + if (LangStd == LangStandard::lang_opencl) Opts.OpenCLVersion = 100; - } - else if (LangStd == LangStandard::lang_opencl11) { - Opts.OpenCL = 1; + else if (LangStd == LangStandard::lang_opencl11) Opts.OpenCLVersion = 110; - } - else if (LangStd == LangStandard::lang_opencl12) { - Opts.OpenCL = 1; + else if (LangStd == LangStandard::lang_opencl12) Opts.OpenCLVersion = 120; - } // OpenCL has some additional defaults. if (Opts.OpenCL) { @@ -1136,8 +1131,7 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK, Opts.NativeHalfType = 1; } - if (LangStd == LangStandard::lang_cuda) - Opts.CUDA = 1; + Opts.CUDA = LangStd == LangStandard::lang_cuda || IK == IK_CUDA; // OpenCL and C++ both have bool, true, false keywords. Opts.Bool = Opts.OpenCL || Opts.CPlusPlus; diff --git a/clang/test/Frontend/stdlang.c b/clang/test/Frontend/stdlang.c new file mode 100644 index 00000000000..71997f1403c --- /dev/null +++ b/clang/test/Frontend/stdlang.c @@ -0,0 +1,9 @@ +// RUN: %clang_cc1 -x cuda -std=c++11 -DCUDA %s +// RUN: %clang_cc1 -x cl -std=c99 -DOPENCL %s +// expected-no-diagnostics + +#if defined(CUDA) + __attribute__((device)) void f_device(); +#elif defined(OPENCL) + kernel void func(void); +#endif diff --git a/clang/test/Index/attributes-cuda.cu b/clang/test/Index/attributes-cuda.cu index dd571f15a86..953ef3d51fe 100644 --- a/clang/test/Index/attributes-cuda.cu +++ b/clang/test/Index/attributes-cuda.cu @@ -1,11 +1,10 @@ -// RUN: c-index-test -test-load-source all -x cuda -std=cuda %s | FileCheck %s +// RUN: c-index-test -test-load-source all -x cuda %s | FileCheck %s __attribute__((device)) void f_device(); __attribute__((global)) void f_global(); __attribute__((constant)) int* g_constant; __attribute__((host)) void f_host(); - // CHECK: attributes-cuda.cu:3:30: FunctionDecl=f_device:3:30 // CHECK-NEXT: attributes-cuda.cu:3:16: attribute(device) // CHECK: attributes-cuda.cu:4:30: FunctionDecl=f_global:4:30 |
