[OpenCL] Allow explicit cast of 0 to event_t.

Patch by Aaron Enye Shi.

Differential Revision: http://reviews.llvm.org/D17578

llvm-svn: 270238
This commit is contained in:
Yaxun Liu 2016-05-20 17:18:16 +00:00
parent 5496a23316
commit c537c8a72b
4 changed files with 21 additions and 0 deletions

View File

@ -7821,6 +7821,8 @@ def err_sampler_argument_required : Error<
"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<

View File

@ -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();

View File

@ -8,5 +8,7 @@ void kernel ker() {
foo(e);
// 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)
}

View File

@ -14,5 +14,6 @@ void kernel ker(event_t argevt) { // expected-error {{'event_t' cannot be used a
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'}}
}