<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr">
<div id="divtagdefaultwrapper" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
<p style="margin-top:0;margin-bottom:0">Hi Hans,<br>
</p>
</div>
<div style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
<br>
</div>
<div style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
I would like to ask you to merge this commit into the release 9.0 even though it isn't really a bug fix. However it is a small rename in the command line interface (unfortunately affecting many files). This has been agreed the last minutes and we can only do
this change in clang9 because it's entirely a new feature. Sorry we haven't managed to commit before the branch was taken. I hope it is still ok.</div>
<div style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
<br>
</div>
<div style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
Thank you,</div>
<div style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
Anastasia<br>
</div>
<div style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
<br>
<br>
<div style="color: rgb(0, 0, 0);">
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> cfe-commits <cfe-commits-bounces@lists.llvm.org> on behalf of Anastasia Stulova via cfe-commits <cfe-commits@lists.llvm.org><br>
<b>Sent:</b> 25 July 2019 12:04<br>
<b>To:</b> cfe-commits@lists.llvm.org <cfe-commits@lists.llvm.org><br>
<b>Subject:</b> r367008 - [OpenCL] Rename lang mode flag for C++ mode</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Author: stulova<br>
Date: Thu Jul 25 04:04:29 2019<br>
New Revision: 367008<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=367008&view=rev">http://llvm.org/viewvc/llvm-project?rev=367008&view=rev</a><br>
Log:<br>
[OpenCL] Rename lang mode flag for C++ mode<br>
<br>
Rename lang mode flag to -cl-std=clc++/-cl-std=CLC++<br>
or -std=clc++/-std=CLC++.<br>
<br>
This aligns with OpenCL C conversion and removes ambiguity<br>
with OpenCL C++. <br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D65102">https://reviews.llvm.org/D65102</a><br>
<br>
<br>
<br>
Modified:<br>
cfe/trunk/docs/LanguageExtensions.rst<br>
cfe/trunk/docs/UsersManual.rst<br>
cfe/trunk/include/clang/Driver/Options.td<br>
cfe/trunk/include/clang/Frontend/LangStandards.def<br>
cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp<br>
cfe/trunk/test/CodeGenOpenCL/builtins.cl<br>
cfe/trunk/test/CodeGenOpenCL/images.cl<br>
cfe/trunk/test/CodeGenOpenCL/logical-ops.cl<br>
cfe/trunk/test/CodeGenOpenCL/pipe_builtin.cl<br>
cfe/trunk/test/CodeGenOpenCL/sampler.cl<br>
cfe/trunk/test/CodeGenOpenCL/spir_version.cl<br>
cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/address-space-castoperators.cpp<br>
cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction2.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/addrspace-conversion.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/addrspace-of-this.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/addrspace-operators.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/addrspace-references.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/addrspace-with-class.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/atexit.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/global_init.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/local_addrspace_init.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/method-overload-address-space.cl<br>
cfe/trunk/test/CodeGenOpenCLCXX/template-address-spaces.cl<br>
cfe/trunk/test/Driver/autocomplete.c<br>
cfe/trunk/test/Driver/opencl.cl<br>
cfe/trunk/test/Frontend/opencl.cl<br>
cfe/trunk/test/Frontend/stdlang.c<br>
cfe/trunk/test/Headers/opencl-c-header.cl<br>
cfe/trunk/test/Parser/opencl-cxx-keywords.cl<br>
cfe/trunk/test/Parser/opencl-cxx-virtual.cl<br>
cfe/trunk/test/Preprocessor/predefined-macros.c<br>
cfe/trunk/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl<br>
cfe/trunk/test/SemaOpenCL/address-spaces.cl<br>
cfe/trunk/test/SemaOpenCL/builtin.cl<br>
cfe/trunk/test/SemaOpenCL/clk_event_t.cl<br>
cfe/trunk/test/SemaOpenCL/extension-version.cl<br>
cfe/trunk/test/SemaOpenCL/extensions.cl<br>
cfe/trunk/test/SemaOpenCL/invalid-image.cl<br>
cfe/trunk/test/SemaOpenCL/invalid-pipes-cl2.0.cl<br>
cfe/trunk/test/SemaOpenCLCXX/address-space-deduction.cl<br>
cfe/trunk/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl<br>
cfe/trunk/test/SemaOpenCLCXX/address-space-of-this.cl<br>
cfe/trunk/test/SemaOpenCLCXX/address-space-references.cl<br>
cfe/trunk/test/SemaOpenCLCXX/address-space-templates.cl<br>
cfe/trunk/test/SemaOpenCLCXX/address_space_overloading.cl<br>
cfe/trunk/test/SemaOpenCLCXX/kernel_invalid.cl<br>
cfe/trunk/test/SemaOpenCLCXX/method-overload-address-space.cl<br>
cfe/trunk/test/SemaOpenCLCXX/newdelete.cl<br>
cfe/trunk/test/SemaOpenCLCXX/restricted.cl<br>
<br>
Modified: cfe/trunk/docs/LanguageExtensions.rst<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/LanguageExtensions.rst?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/LanguageExtensions.rst?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/docs/LanguageExtensions.rst (original)<br>
+++ cfe/trunk/docs/LanguageExtensions.rst Thu Jul 25 04:04:29 2019<br>
@@ -1779,7 +1779,7 @@ invoked.<br>
<br>
.. code-block:: console<br>
<br>
- clang -cl-std=c++ test.cl<br>
+ clang -cl-std=clc++ test.cl<br>
<br>
If there are any global objects to be initialized the final binary will<br>
contain ``@_GLOBAL__sub_I_test.cl`` kernel to be enqueued.<br>
<br>
Modified: cfe/trunk/docs/UsersManual.rst<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/UsersManual.rst?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/UsersManual.rst?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/docs/UsersManual.rst (original)<br>
+++ cfe/trunk/docs/UsersManual.rst Thu Jul 25 04:04:29 2019<br>
@@ -2776,7 +2776,7 @@ restrictions from OpenCL C v2.0 will inh<br>
and function libraries are supported and can be used in the new mode.<br>
<br>
To enable the new mode pass the following command line option when compiling ``.cl``<br>
-file ``-cl-std=c++`` or ``-std=c++``.<br>
+file ``-cl-std=clc++``, ``-cl-std=CLC++``, ``-std=clc++`` or ``-std=CLC++``.<br>
<br>
.. code-block:: c++<br>
<br>
@@ -2794,7 +2794,7 @@ file ``-cl-std=c++`` or ``-std=c++``.<br>
<br>
.. code-block:: console<br>
<br>
- clang -cl-std=c++ test.cl<br>
+ clang -cl-std=clc++ test.cl<br>
<br>
.. _target_features:<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Driver/Options.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/Options.td (original)<br>
+++ cfe/trunk/include/clang/Driver/Options.td Thu Jul 25 04:04:29 2019<br>
@@ -518,7 +518,7 @@ def cl_mad_enable : Flag<["-"], "cl-mad-<br>
def cl_no_signed_zeros : Flag<["-"], "cl-no-signed-zeros">, Group<opencl_Group>, Flags<[CC1Option]>,<br>
HelpText<"OpenCL only. Allow use of less precise no signed zeros computations in the generated binary.">;<br>
def cl_std_EQ : Joined<["-"], "cl-std=">, Group<opencl_Group>, Flags<[CC1Option]>,<br>
- HelpText<"OpenCL language standard to compile for.">, Values<"cl,CL,cl1.1,CL1.1,cl1.2,CL1.2,cl2.0,CL2.0,c++">;<br>
+ HelpText<"OpenCL language standard to compile for.">, Values<"cl,CL,cl1.1,CL1.1,cl1.2,CL1.2,cl2.0,CL2.0,clc++,CLC++">;<br>
def cl_denorms_are_zero : Flag<["-"], "cl-denorms-are-zero">, Group<opencl_Group>, Flags<[CC1Option]>,<br>
HelpText<"OpenCL only. Allow denormals to be flushed to zero.">;<br>
def cl_fp32_correctly_rounded_divide_sqrt : Flag<["-"], "cl-fp32-correctly-rounded-divide-sqrt">, Group<opencl_Group>, Flags<[CC1Option]>,<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/LangStandards.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/LangStandards.def?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/LangStandards.def?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/LangStandards.def (original)<br>
+++ cfe/trunk/include/clang/Frontend/LangStandards.def Thu Jul 25 04:04:29 2019<br>
@@ -174,6 +174,7 @@ LANGSTANDARD_ALIAS_DEPR(opencl10, "CL")<br>
LANGSTANDARD_ALIAS_DEPR(opencl11, "CL1.1")<br>
LANGSTANDARD_ALIAS_DEPR(opencl12, "CL1.2")<br>
LANGSTANDARD_ALIAS_DEPR(opencl20, "CL2.0")<br>
+LANGSTANDARD_ALIAS_DEPR(openclcpp, "CLC++")<br>
<br>
// CUDA<br>
LANGSTANDARD(cuda, "cuda", CUDA, "NVIDIA CUDA(tm)",<br>
<br>
Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Thu Jul 25 04:04:29 2019<br>
@@ -2433,7 +2433,7 @@ static void ParseLangArgs(LangOptions &O<br>
.Cases("cl1.1", "CL1.1", LangStandard::lang_opencl11)<br>
.Cases("cl1.2", "CL1.2", LangStandard::lang_opencl12)<br>
.Cases("cl2.0", "CL2.0", LangStandard::lang_opencl20)<br>
- .Case("c++", LangStandard::lang_openclcpp)<br>
+ .Cases("clc++", "CLC++", LangStandard::lang_openclcpp)<br>
.Default(LangStandard::lang_unspecified);<br>
<br>
if (OpenCLLangStd == LangStandard::lang_unspecified) {<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp Thu Jul 25 04:04:29 2019<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s --check-prefixes=CHECK,CHECKNOOCL<br>
// RUN: %clang_cc1 -emit-llvm -triple x86_64-windows-msvc -o - %s | FileCheck %s --check-prefixes=WIN,WINNOOCL<br>
-// RUN: %clang_cc1 -cl-std=c++ -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s --check-prefixes=CHECK,CHECKOCL<br>
-// RUN: %clang_cc1 -cl-std=c++ -emit-llvm -triple x86_64-windows-msvc -o - %s | FileCheck %s --check-prefixes=WIN,WINOCL<br>
+// RUN: %clang_cc1 -cl-std=clc++ -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s --check-prefixes=CHECK,CHECKOCL<br>
+// RUN: %clang_cc1 -cl-std=clc++ -emit-llvm -triple x86_64-windows-msvc -o - %s | FileCheck %s --check-prefixes=WIN,WINOCL<br>
<br>
// CHECKNOOCL-LABEL: define {{.*}}void @_Z2f0Pc<br>
// WINNOOCL-LABEL: define {{.*}}void @"?f0@@YAXPEAD@Z"<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCL/builtins.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/builtins.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/builtins.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCL/builtins.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCL/builtins.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -finclude-default-header -cl-std=c++ -fblocks -O0 -emit-llvm -o - -triple "spir-unknown-unknown" | FileCheck %s<br>
+// RUN: %clang_cc1 %s -finclude-default-header -cl-std=clc++ -fblocks -O0 -emit-llvm -o - -triple "spir-unknown-unknown" | FileCheck %s<br>
<br>
void testBranchingOnEnqueueKernel(queue_t default_queue, unsigned flags, ndrange_t ndrange) {<br>
// Ensure `enqueue_kernel` can be branched upon.<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCL/images.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/images.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/images.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCL/images.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCL/images.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - | FileCheck %s<br>
-// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - -cl-std=c++ | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - -cl-std=clc++ | FileCheck %s<br>
<br>
__attribute__((overloadable)) void read_image(read_only image1d_t img_ro);<br>
__attribute__((overloadable)) void read_image(write_only image1d_t img_wo);<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCL/logical-ops.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/logical-ops.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/logical-ops.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCL/logical-ops.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCL/logical-ops.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL1.2 -O1 -triple x86_64-unknown-linux-gnu | FileCheck %s<br>
-// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=c++ -O1 -triple x86_64-unknown-linux-gnu | FileCheck %s<br>
+// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=clc++ -O1 -triple x86_64-unknown-linux-gnu | FileCheck %s<br>
<br>
#pragma OPENCL EXTENSION cl_khr_fp64 : enable<br>
<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCL/pipe_builtin.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/pipe_builtin.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/pipe_builtin.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCL/pipe_builtin.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCL/pipe_builtin.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -cl-ext=+cl_khr_subgroups -O0 -cl-std=c++ -o - %s | FileCheck %s<br>
+// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -cl-ext=+cl_khr_subgroups -O0 -cl-std=clc++ -o - %s | FileCheck %s<br>
// FIXME: Add MS ABI manglings of OpenCL things and remove %itanium_abi_triple<br>
// above to support OpenCL in the MS C++ ABI.<br>
<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCL/sampler.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/sampler.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/sampler.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCL/sampler.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCL/sampler.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,6 +1,6 @@<br>
// RUN: %clang_cc1 %s -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s<br>
// RUN: %clang_cc1 %s -cl-std=CL2.0 -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s<br>
-// RUN: %clang_cc1 %s -cl-std=c++ -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s<br>
+// RUN: %clang_cc1 %s -cl-std=clc++ -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s<br>
//<br>
// This test covers 5 cases of sampler initialzation:<br>
// 1. function argument passing<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCL/spir_version.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/spir_version.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/spir_version.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCL/spir_version.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCL/spir_version.cl Thu Jul 25 04:04:29 2019<br>
@@ -6,7 +6,7 @@<br>
// RUN: %clang_cc1 %s -triple "spir64-unknown-unknown" -emit-llvm -o - -cl-std=CL2.0 | FileCheck %s --check-prefix=CHECK-SPIR-CL20<br>
<br>
<br>
-// RUN: %clang_cc1 %s -triple "spir64-unknown-unknown" -emit-llvm -o - -cl-std=c++ | FileCheck %s --check-prefix=CHECK-SPIR-CL20<br>
+// RUN: %clang_cc1 %s -triple "spir64-unknown-unknown" -emit-llvm -o - -cl-std=clc++ | FileCheck %s --check-prefix=CHECK-SPIR-CL20<br>
<br>
// RUN: %clang_cc1 %s -triple "amdgcn--amdhsa" -emit-llvm -o - | FileCheck %s --check-prefix=CHECK-AMDGCN-CL10<br>
// RUN: %clang_cc1 %s -triple "amdgcn--amdhsa" -emit-llvm -o - -cl-std=CL1.2 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL12<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCL/to_addr_builtin.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm -O0 -cl-std=c++ -o - %s | FileCheck %s<br>
+// RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm -O0 -cl-std=clc++ -o - %s | FileCheck %s<br>
<br>
// CHECK: %[[A:.*]] = type { float, float, float }<br>
typedef struct {<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/address-space-castoperators.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/address-space-castoperators.cpp?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/address-space-castoperators.cpp?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/address-space-castoperators.cpp (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/address-space-castoperators.cpp Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
void test_reinterpret_cast(){<br>
__private float x;<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -O0 -emit-llvm -o - | FileCheck %s -check-prefixes=COMMON,PTR<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -O0 -emit-llvm -o - -DREF | FileCheck %s -check-prefixes=COMMON,REF<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -O0 -emit-llvm -o - | FileCheck %s -check-prefixes=COMMON,PTR<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -O0 -emit-llvm -o - -DREF | FileCheck %s -check-prefixes=COMMON,REF<br>
<br>
#ifdef REF<br>
#define PTR &<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction2.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction2.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction2.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction2.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/address-space-deduction2.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -O0 -emit-llvm -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -O0 -emit-llvm -o - | FileCheck %s<br>
<br>
class P {<br>
public:<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/addrspace-conversion.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-conversion.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-conversion.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/addrspace-conversion.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/addrspace-conversion.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
void bar(__generic volatile unsigned int* ptr)<br>
{<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
struct B {<br>
int mb;<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/addrspace-of-this.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-of-this.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-of-this.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/addrspace-of-this.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/addrspace-of-this.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,6 +1,6 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -pedantic -verify -O0 -o - -DDECL | FileCheck %s --check-prefixes="COMMON,EXPL"<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -pedantic -verify -O0 -o - -DDECL -DUSE_DEFLT | FileCheck %s --check-prefixes="COMMON,IMPL"<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -pedantic -verify -O0 -o - | FileCheck %s --check-prefixes="COMMON,IMPL"<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -pedantic -verify -O0 -o - -DDECL | FileCheck %s --check-prefixes="COMMON,EXPL"<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -pedantic -verify -O0 -o - -DDECL -DUSE_DEFLT | FileCheck %s --check-prefixes="COMMON,IMPL"<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -pedantic -verify -O0 -o - | FileCheck %s --check-prefixes="COMMON,IMPL"<br>
// expected-no-diagnostics<br>
<br>
// Test that the 'this' pointer is in the __generic address space.<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/addrspace-operators.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-operators.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-operators.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/addrspace-operators.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/addrspace-operators.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+//RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
enum E {<br>
a,<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/addrspace-references.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-references.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-references.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/addrspace-references.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/addrspace-references.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -cl-std=c++ -triple spir -emit-llvm -o - | FileCheck %s<br>
+//RUN: %clang_cc1 %s -cl-std=clc++ -triple spir -emit-llvm -o - | FileCheck %s<br>
<br>
int bar(const unsigned int &i);<br>
// CHECK-LABEL: define spir_func void @_Z3foov() <br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/addrspace-with-class.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-with-class.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-with-class.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/addrspace-with-class.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/addrspace-with-class.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s --check-prefix=CHECK-DEFINITIONS<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CLC++ -emit-llvm -O0 -o - | FileCheck %s --check-prefix=CHECK-DEFINITIONS<br>
<br>
// This test ensures the proper address spaces and address space cast are used<br>
// for constructors, member functions and destructors.<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/atexit.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/atexit.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/atexit.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/atexit.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/atexit.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+//RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
struct S {<br>
~S(){};<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/global_init.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/global_init.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/global_init.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/global_init.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/global_init.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
struct S {<br>
S() {}<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/local_addrspace_init.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/local_addrspace_init.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/local_addrspace_init.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/local_addrspace_init.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/local_addrspace_init.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
// Test that we don't initialize local address space objects.<br>
//CHECK: @_ZZ4testE1i = internal addrspace(3) global i32 undef<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/method-overload-address-space.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/method-overload-address-space.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/method-overload-address-space.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/method-overload-address-space.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/method-overload-address-space.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s<br>
+//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s<br>
<br>
struct C {<br>
void foo() __local;<br>
<br>
Modified: cfe/trunk/test/CodeGenOpenCLCXX/template-address-spaces.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/template-address-spaces.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/template-address-spaces.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenOpenCLCXX/template-address-spaces.cl (original)<br>
+++ cfe/trunk/test/CodeGenOpenCLCXX/template-address-spaces.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -cl-std=c++ %s -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s<br>
+// RUN: %clang_cc1 -cl-std=clc++ %s -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s<br>
<br>
template <typename T><br>
struct S{<br>
<br>
Modified: cfe/trunk/test/Driver/autocomplete.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/autocomplete.c?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/autocomplete.c?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/autocomplete.c (original)<br>
+++ cfe/trunk/test/Driver/autocomplete.c Thu Jul 25 04:04:29 2019<br>
@@ -34,8 +34,8 @@<br>
// RUN: %clang --autocomplete=-cl-std=,CL2 | FileCheck %s -check-prefix=CLSTD<br>
// CLSTD: CL2.0<br>
// RUN: %clang --autocomplete=-cl-std= | FileCheck %s -check-prefix=CLSTDALL<br>
-// CLSTDALL: c++<br>
-// CLSTDALL-NEXT: cl<br>
+<br>
+// CLSTDALL: cl<br>
// CLSTDALL-NEXT: CL<br>
// CLSTDALL-NEXT: cl1.1<br>
// CLSTDALL-NEXT: CL1.1<br>
@@ -43,6 +43,8 @@<br>
// CLSTDALL-NEXT: CL1.2<br>
// CLSTDALL-NEXT: cl2.0<br>
// CLSTDALL-NEXT: CL2.0<br>
+// CLSTDALL-NEXT: clc++<br>
+// CLSTDALL-NEXT: CLC++<br>
// RUN: %clang --autocomplete=-fno-sanitize-coverage=,f | FileCheck %s -check-prefix=FNOSANICOVER<br>
// FNOSANICOVER: func<br>
// RUN: %clang --autocomplete=-fno-sanitize-coverage= | FileCheck %s -check-prefix=FNOSANICOVERALL<br>
<br>
Modified: cfe/trunk/test/Driver/opencl.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/opencl.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/opencl.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/opencl.cl (original)<br>
+++ cfe/trunk/test/Driver/opencl.cl Thu Jul 25 04:04:29 2019<br>
@@ -2,7 +2,7 @@<br>
// RUN: %clang -S -### -cl-std=CL1.1 %s 2>&1 | FileCheck --check-prefix=CHECK-CL11 %s<br>
// RUN: %clang -S -### -cl-std=CL1.2 %s 2>&1 | FileCheck --check-prefix=CHECK-CL12 %s<br>
// RUN: %clang -S -### -cl-std=CL2.0 %s 2>&1 | FileCheck --check-prefix=CHECK-CL20 %s<br>
-// RUN: %clang -S -### -cl-std=c++ %s 2>&1 | FileCheck --check-prefix=CHECK-CLCPP %s<br>
+// RUN: %clang -S -### -cl-std=clc++ %s 2>&1 | FileCheck --check-prefix=CHECK-CLCPP %s<br>
// RUN: %clang -S -### -cl-opt-disable %s 2>&1 | FileCheck --check-prefix=CHECK-OPT-DISABLE %s<br>
// RUN: %clang -S -### -cl-strict-aliasing %s 2>&1 | FileCheck --check-prefix=CHECK-STRICT-ALIASING %s<br>
// RUN: %clang -S -### -cl-single-precision-constant %s 2>&1 | FileCheck --check-prefix=CHECK-SINGLE-PRECISION-CONST %s<br>
@@ -22,7 +22,7 @@<br>
// CHECK-CL11: "-cc1" {{.*}} "-cl-std=CL1.1"<br>
// CHECK-CL12: "-cc1" {{.*}} "-cl-std=CL1.2"<br>
// CHECK-CL20: "-cc1" {{.*}} "-cl-std=CL2.0"<br>
-// CHECK-CLCPP: "-cc1" {{.*}} "-cl-std=c++"<br>
+// CHECK-CLCPP: "-cc1" {{.*}} "-cl-std=clc++"<br>
// CHECK-OPT-DISABLE: "-cc1" {{.*}} "-cl-opt-disable"<br>
// CHECK-STRICT-ALIASING: "-cc1" {{.*}} "-cl-strict-aliasing"<br>
// CHECK-SINGLE-PRECISION-CONST: "-cc1" {{.*}} "-cl-single-precision-constant"<br>
<br>
Modified: cfe/trunk/test/Frontend/opencl.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/opencl.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/opencl.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Frontend/opencl.cl (original)<br>
+++ cfe/trunk/test/Frontend/opencl.cl Thu Jul 25 04:04:29 2019<br>
@@ -2,7 +2,7 @@<br>
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.1 -DSYNTAX<br>
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.2 -DSYNTAX<br>
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL2.0 -DSYNTAX<br>
-// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=c++ -DSYNTAX<br>
+// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=clc++ -DSYNTAX<br>
// RUN: %clang_cc1 %s -verify -fsyntax-only -fblocks -DBLOCKS -DSYNTAX<br>
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.1 -fblocks -DBLOCKS -DSYNTAX<br>
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.2 -fblocks -DBLOCKS -DSYNTAX<br>
<br>
Modified: cfe/trunk/test/Frontend/stdlang.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/stdlang.c?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/stdlang.c?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Frontend/stdlang.c (original)<br>
+++ cfe/trunk/test/Frontend/stdlang.c Thu Jul 25 04:04:29 2019<br>
@@ -4,11 +4,12 @@<br>
// RUN: %clang_cc1 -x cl -cl-std=cl1.1 -DOPENCL %s<br>
// RUN: %clang_cc1 -x cl -cl-std=cl1.2 -DOPENCL %s<br>
// RUN: %clang_cc1 -x cl -cl-std=cl2.0 -DOPENCL %s<br>
-// RUN: %clang_cc1 -x cl -cl-std=c++ -DOPENCL %s<br>
+// RUN: %clang_cc1 -x cl -cl-std=clc++ -DOPENCL %s<br>
// RUN: %clang_cc1 -x cl -cl-std=CL -DOPENCL %s<br>
// RUN: %clang_cc1 -x cl -cl-std=CL1.1 -DOPENCL %s<br>
// RUN: %clang_cc1 -x cl -cl-std=CL1.2 -DOPENCL %s<br>
// RUN: %clang_cc1 -x cl -cl-std=CL2.0 -DOPENCL %s<br>
+// RUN: %clang_cc1 -x cl -cl-std=CLC++ -DOPENCL %s<br>
// RUN: not %clang_cc1 -x cl -std=c99 -DOPENCL %s 2>&1 | FileCheck --check-prefix=CHECK-C99 %s<br>
// RUN: not %clang_cc1 -x cl -cl-std=invalid -DOPENCL %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID %s<br>
// CHECK-C99: error: invalid argument '-std=c99' not allowed with 'OpenCL'<br>
<br>
Modified: cfe/trunk/test/Headers/opencl-c-header.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/opencl-c-header.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/opencl-c-header.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Headers/opencl-c-header.cl (original)<br>
+++ cfe/trunk/test/Headers/opencl-c-header.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify | FileCheck %s<br>
// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=CL1.1 | FileCheck %s<br>
// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=CL1.2 | FileCheck %s<br>
-// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=c++ | FileCheck %s --check-prefix=CHECK20<br>
+// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=clc++ | FileCheck %s --check-prefix=CHECK20<br>
<br>
// Test including the default header as a module.<br>
// The module should be compiled only once and loaded from cache afterwards.<br>
<br>
Modified: cfe/trunk/test/Parser/opencl-cxx-keywords.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/opencl-cxx-keywords.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/opencl-cxx-keywords.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Parser/opencl-cxx-keywords.cl (original)<br>
+++ cfe/trunk/test/Parser/opencl-cxx-keywords.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -verify -fsyntax-only<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -verify -fsyntax-only -fexceptions -fcxx-exceptions<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -verify -fsyntax-only<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -verify -fsyntax-only -fexceptions -fcxx-exceptions<br>
<br>
// This test checks that various C++ and OpenCL C keywords are not available<br>
// in OpenCL.<br>
<br>
Modified: cfe/trunk/test/Parser/opencl-cxx-virtual.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/opencl-cxx-virtual.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/opencl-cxx-virtual.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Parser/opencl-cxx-virtual.cl (original)<br>
+++ cfe/trunk/test/Parser/opencl-cxx-virtual.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -fsyntax-only -verify<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -fsyntax-only -verify<br>
<br>
// Test that virtual functions and abstract classes are rejected.<br>
class virtual_functions {<br>
<br>
Modified: cfe/trunk/test/Preprocessor/predefined-macros.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/predefined-macros.c?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/predefined-macros.c?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Preprocessor/predefined-macros.c (original)<br>
+++ cfe/trunk/test/Preprocessor/predefined-macros.c Thu Jul 25 04:04:29 2019<br>
@@ -131,7 +131,7 @@<br>
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL20<br>
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-fast-relaxed-math \<br>
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-FRM<br>
-// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=c++ \<br>
+// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=clc++ \<br>
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CLCPP10<br>
// CHECK-CL10: #define CL_VERSION_1_0 100<br>
// CHECK-CL10: #define CL_VERSION_1_1 110<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,9 +1,9 @@<br>
// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=CL2.0<br>
// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=CL2.0<br>
// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=CL2.0<br>
-// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=c++<br>
-// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=c++<br>
-// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=c++<br>
+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=clc++<br>
+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=clc++<br>
+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=clc++<br>
<br>
/* OpenCLC v2.0 adds a set of restrictions for conversions between pointers to<br>
* different address spaces, mainly described in Sections 6.5.5 and 6.5.6.<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/address-spaces.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/address-spaces.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/address-spaces.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/address-spaces.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/address-spaces.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,6 +1,6 @@<br>
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only<br>
// RUN: %clang_cc1 %s -cl-std=CL2.0 -verify -pedantic -fsyntax-only<br>
-// RUN: %clang_cc1 %s -cl-std=c++ -verify -pedantic -fsyntax-only<br>
+// RUN: %clang_cc1 %s -cl-std=clc++ -verify -pedantic -fsyntax-only<br>
<br>
__constant int ci = 1;<br>
<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/builtin.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/builtin.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/builtin.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/builtin.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/builtin.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL1.2<br>
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++<br>
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++<br>
<br>
// expected-no-diagnostics<br>
<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/clk_event_t.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/clk_event_t.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/clk_event_t.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/clk_event_t.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/clk_event_t.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0<br>
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++<br>
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++<br>
<br>
// Taken from opencl-c.h<br>
#define CLK_NULL_EVENT (__builtin_astype(((__SIZE_MAX__)), clk_event_t))<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/extension-version.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/extension-version.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/extension-version.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/extension-version.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/extension-version.cl Thu Jul 25 04:04:29 2019<br>
@@ -2,12 +2,12 @@<br>
// RUN: %clang_cc1 -x cl -cl-std=CL1.1 %s -verify -triple spir-unknown-unknown<br>
// RUN: %clang_cc1 -x cl -cl-std=CL1.2 %s -verify -triple spir-unknown-unknown<br>
// RUN: %clang_cc1 -x cl -cl-std=CL2.0 %s -verify -triple spir-unknown-unknown<br>
-// RUN: %clang_cc1 -x cl -cl-std=c++ %s -verify -triple spir-unknown-unknown<br>
+// RUN: %clang_cc1 -x cl -cl-std=clc++ %s -verify -triple spir-unknown-unknown<br>
// RUN: %clang_cc1 -x cl -cl-std=CL %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES<br>
// RUN: %clang_cc1 -x cl -cl-std=CL1.1 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES<br>
// RUN: %clang_cc1 -x cl -cl-std=CL1.2 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES<br>
// RUN: %clang_cc1 -x cl -cl-std=CL2.0 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES<br>
-// RUN: %clang_cc1 -x cl -cl-std=c++ %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES<br>
+// RUN: %clang_cc1 -x cl -cl-std=clc++ %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES<br>
<br>
#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200) && !defined(TEST_CORE_FEATURES)<br>
// expected-no-diagnostics<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/extensions.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/extensions.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/extensions.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/extensions.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/extensions.cl Thu Jul 25 04:04:29 2019<br>
@@ -28,7 +28,7 @@<br>
// enabled by default with -cl-std=CL2.0).<br>
//<br>
// RUN: %clang_cc1 %s -triple amdgcn-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL2.0 -finclude-default-header<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=c++<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=clc++<br>
<br>
#ifdef _OPENCL_H_<br>
// expected-no-diagnostics<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/invalid-image.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/invalid-image.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/invalid-image.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/invalid-image.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/invalid-image.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -verify -cl-std=c++ %s<br>
+// RUN: %clang_cc1 -verify -cl-std=clc++ %s<br>
// RUN: %clang_cc1 -verify %s<br>
// RUN: %clang_cc1 -verify -D=ATTR_TEST -fms-compatibility %s<br>
<br>
<br>
Modified: cfe/trunk/test/SemaOpenCL/invalid-pipes-cl2.0.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/invalid-pipes-cl2.0.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/invalid-pipes-cl2.0.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCL/invalid-pipes-cl2.0.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCL/invalid-pipes-cl2.0.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,5 +1,5 @@<br>
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0<br>
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++<br>
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++<br>
<br>
global pipe int gp; // expected-error {{type '__global read_only pipe int' can only be used as a function parameter in OpenCL}}<br>
global reserve_id_t rid; // expected-error {{the '__global reserve_id_t' type cannot be used to declare a program scope variable}}<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/address-space-deduction.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-deduction.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-deduction.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/address-space-deduction.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/address-space-deduction.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -cl-std=c++ -pedantic -ast-dump -verify | FileCheck %s<br>
+//RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -ast-dump -verify | FileCheck %s<br>
<br>
//expected-no-diagnostics<br>
<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify<br>
+//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify<br>
<br>
struct C {<br>
auto fGlob() __global -> decltype(this);<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/address-space-of-this.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-of-this.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-of-this.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/address-space-of-this.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/address-space-of-this.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only<br>
// expected-no-diagnostics<br>
<br>
// Extract from PR38614<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/address-space-references.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-references.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-references.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/address-space-references.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/address-space-references.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only<br>
<br>
__global const int& f(__global float &ref) {<br>
return ref; // expected-error{{reference of type 'const __global int &' cannot bind to a temporary object because of address space mismatch}}<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/address-space-templates.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-templates.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address-space-templates.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/address-space-templates.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/address-space-templates.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -cl-std=c++ -pedantic -verify -fsyntax-only<br>
+//RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -verify -fsyntax-only<br>
<br>
template <typename T><br>
struct S {<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/address_space_overloading.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address_space_overloading.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/address_space_overloading.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/address_space_overloading.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/address_space_overloading.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++<br>
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++<br>
// expected-no-diagnostics<br>
<br>
struct RetGlob {<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/kernel_invalid.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/kernel_invalid.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/kernel_invalid.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/kernel_invalid.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/kernel_invalid.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -cl-std=c++ -pedantic -verify -fsyntax-only<br>
+// RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -verify -fsyntax-only<br>
<br>
struct C {<br>
kernel void m(); //expected-error{{kernel functions cannot be class members}}<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/method-overload-address-space.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/method-overload-address-space.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/method-overload-address-space.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/method-overload-address-space.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/method-overload-address-space.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify<br>
+//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify<br>
<br>
struct C {<br>
void m1() __local __local; //expected-warning{{multiple identical address spaces specified for type}}<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/newdelete.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/newdelete.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/newdelete.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/newdelete.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/newdelete.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only<br>
<br>
class A {<br>
public:<br>
<br>
Modified: cfe/trunk/test/SemaOpenCLCXX/restricted.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/restricted.cl?rev=367008&r1=367007&r2=367008&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCLCXX/restricted.cl?rev=367008&r1=367007&r2=367008&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaOpenCLCXX/restricted.cl (original)<br>
+++ cfe/trunk/test/SemaOpenCLCXX/restricted.cl Thu Jul 25 04:04:29 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only<br>
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only<br>
<br>
// This test checks that various C/C++/OpenCL C constructs are not available in<br>
// C++ for OpenCL.<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
cfe-commits@lists.llvm.org<br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div>
</span></font></div>
</div>
</div>
</div>
</body>
</html>