[PR41007][OpenCL] Allow printf and toolchain reserved variadic functions in C++

[Anastasia]

Summary

As for OpenCL C, we will allow printf and other variadic functions (prefixed by "__") in C++ mode.

[neil.hickey]

LGTM!

[bader]

cfe/trunk/test/SemaOpenCL/extensions.cl

31

Shoudn't we move this test to test/SemaOpenCLCXX?
Does -finclude-default-header include opencl-c.h? I think it's an overkill to test that OpenCL C++ allows printf. Ideally we should minimize number of times we parsing 11500+ lines header in LIT tests.

[Anastasia]

cfe/trunk/test/SemaOpenCL/extensions.cl

31

Shoudn't we move this test to test/SemaOpenCLCXX?

Right now test/SemaOpenCLCXX and other corresponding folders contain only functionality specific to C++.

In test/SemaOpenCL we will keep tests that are OpenCL C compatible even though we are parsing some of them in C++ mode too. We could create a common folder but I don't see much value in this. Let me know if you have other thoughts.

Does -finclude-default-header include opencl-c.h? I think it's an overkill to test that OpenCL C++ allows printf. Ideally we should minimize number of times we parsing 11500+ lines header in LIT tests.

Yes, I perfectly agree. I would like to make sure that the header is parsed successfully in C++ mode. So it is not just for printf. There are a few other places where we parse the header, I can move this into them if you prefer. May be test/Driver/include-default-header.cl would make more sense to show the intent?

[bader]

May be test/Driver/include-default-header.cl would make more sense to show the intent?

test/Headers/opencl-c-header.cl sounds like good candidate.

cfe/trunk/lib/Sema/SemaType.cpp

case DeclaratorChunk::Function: {
           D.setInvalidType(true);
         }
         // OpenCL doesn't support variadic functions and blocks
         // (s6.9.e and s6.12.5 OpenCL v2.0) except for printf.
         // We also allow here any toolchain reserved identifiers.
         if (FTI.isVariadic &&
             !(D.getIdentifier() &&
               ((D.getIdentifier()->getName() == "printf" &&
-                LangOpts.OpenCLVersion >= 120) ||
+                (LangOpts.OpenCLCPlusPlus || LangOpts.OpenCLVersion >= 120)) ||
                D.getIdentifier()->getName().startswith("__")))) {
           S.Diag(D.getIdentifierLoc(), diag::err_opencl_variadic_function);
           D.setInvalidType(true);
         }
       }
 
       // Methods cannot return interface types. All ObjC objects are
       // passed by reference.

cfe/trunk/test/SemaOpenCL/extensions.cl

 // RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-all -cl-ext=+cl_khr_fp64,-cl_khr_fp64,+cl_khr_fp16 -DNOFP64
 
 // Test with -finclude-default-header, which includes opencl-c.h. opencl-c.h
 // disables all extensions by default, but supported core extensions for a
 // particular OpenCL version must be re-enabled (for example, cl_khr_fp64 is
 // enabled by default with -cl-std=CL2.0).
 //
 // RUN: %clang_cc1 %s -triple amdgcn-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL2.0 -finclude-default-header
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=c++
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=c++ -finclude-default-header
 
 #ifdef _OPENCL_H_
 // expected-no-diagnostics
 #endif
 
 #ifdef FP64
 // expected-no-diagnostics
 #endif