Author: yaxunl Date: Fri May 20 12:18:16 2016 New Revision: 270238 URL: http://llvm.org/viewvc/llvm-project?rev=270238&view=rev Log: [OpenCL] Allow explicit cast of 0 to event_t.
Patch by Aaron Enye Shi. Differential Revision: http://reviews.llvm.org/D17578 Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td cfe/trunk/lib/Sema/SemaCast.cpp cfe/trunk/test/CodeGenOpenCL/event_t.cl cfe/trunk/test/SemaOpenCL/event_t.cl Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=270238&r1=270237&r2=270238&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Fri May 20 12:18:16 2016 @@ -7821,6 +7821,8 @@ def err_sampler_argument_required : Erro "sampler_t variable required - got %0">; def err_wrong_sampler_addressspace: Error< "sampler type cannot be used with the __local and __global address space qualifiers">; +def error_opencl_cast_non_zero_to_event_t : Error< + "cannot cast non-zero value '%0' to 'event_t'">; def err_opencl_global_invalid_addr_space : Error< "%select{program scope|static local|extern}0 variable must reside in %1 address space">; def err_missing_actual_pipe_type : Error< Modified: cfe/trunk/lib/Sema/SemaCast.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCast.cpp?rev=270238&r1=270237&r2=270238&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaCast.cpp (original) +++ cfe/trunk/lib/Sema/SemaCast.cpp Fri May 20 12:18:16 2016 @@ -2441,6 +2441,22 @@ void CastOperation::CheckCStyleCast() { return; } + // OpenCL v2.0 s6.13.10 - Allow casts from '0' to event_t type. + if (Self.getLangOpts().OpenCL && DestType->isEventT()) { + llvm::APSInt CastInt; + if (SrcExpr.get()->EvaluateAsInt(CastInt, Self.Context)) { + if (0 == CastInt) { + Kind = CK_ZeroToOCLEvent; + return; + } + Self.Diag(OpRange.getBegin(), + diag::error_opencl_cast_non_zero_to_event_t) + << CastInt.toString(10) << SrcExpr.get()->getSourceRange(); + SrcExpr = ExprError(); + return; + } + } + // Reject any other conversions to non-scalar types. Self.Diag(OpRange.getBegin(), diag::err_typecheck_cond_expect_scalar) << DestType << SrcExpr.get()->getSourceRange(); Modified: cfe/trunk/test/CodeGenOpenCL/event_t.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/event_t.cl?rev=270238&r1=270237&r2=270238&view=diff ============================================================================== --- cfe/trunk/test/CodeGenOpenCL/event_t.cl (original) +++ cfe/trunk/test/CodeGenOpenCL/event_t.cl Fri May 20 12:18:16 2016 @@ -9,4 +9,6 @@ void kernel ker() { // CHECK: call {{.*}}void @foo(%opencl.event_t* % foo(0); // CHECK: call {{.*}}void @foo(%opencl.event_t* null) + foo((event_t)0); +// CHECK: call {{.*}}void @foo(%opencl.event_t* null) } Modified: cfe/trunk/test/SemaOpenCL/event_t.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/event_t.cl?rev=270238&r1=270237&r2=270238&view=diff ============================================================================== --- cfe/trunk/test/SemaOpenCL/event_t.cl (original) +++ cfe/trunk/test/SemaOpenCL/event_t.cl Fri May 20 12:18:16 2016 @@ -14,5 +14,6 @@ void kernel ker(event_t argevt) { // exp foo(e); foo(0); foo(5); // expected-error {{passing 'int' to parameter of incompatible type 'event_t'}} + foo((event_t)1); // expected-error {{cannot cast non-zero value '1' to 'event_t'}} } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
