Skip to content

GitLab

Commit d9ff11a2 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r294313: 

------------------------------------------------------------------------
r294313 | stulova | 2017-02-07 11:09:41 -0500 (Tue, 07 Feb 2017) | 9 lines

[OpenCL] Accept logical NOT for pointer types in CL1.1

Fix for bug 30217 - incorrect error given for logical
NOT operation with a pointer type: corrected sema check
and improved related tests.

Review: D29038

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@303161 91177308-0d34-0410-b5e6-96231b3b80d8
parent 6f1871ce
Hide whitespace changes
Inline Side-by-side
lib/Sema/SemaExpr.cpp
View file @ d9ff11a2
......@@ -11659,7 +11659,7 @@ ExprResult Sema::CreateBuiltinUnaryOp(SourceLocation OpLoc,
Context.getLangOpts().OpenCLVersion < 120) {
// OpenCL v1.1 6.3.h: The logical operator not (!) does not
// operate on scalar float types.
if (!resultType->isIntegerType())
if (!resultType->isIntegerType() && !resultType->isPointerType())
return ExprError(Diag(OpLoc, diag::err_typecheck_unary_expr)
<< resultType << Input.get()->getSourceRange());
}
......
test/SemaOpenCL/invalid-logical-ops-1.1.cl deleted 100644 → 0
View file @ 6f1871ce
// RUN: %clang_cc1 %s -verify -cl-std=CL1.1 -triple x86_64-unknown-linux-gnu
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
typedef __attribute__((ext_vector_type(4))) float float4;
typedef __attribute__((ext_vector_type(4))) double double4;
typedef __attribute__((ext_vector_type(4))) int int4;
typedef __attribute__((ext_vector_type(4))) long long4;
kernel void float_ops() {
int flaf = 0.0f && 0.0f; // expected-error {{invalid operands}}
int flof = 0.0f || 0.0f; // expected-error {{invalid operands}}
float fbaf = 0.0f & 0.0f; // expected-error {{invalid operands}}
float fbof = 0.0f | 0.0f; // expected-error {{invalid operands}}
float fbxf = 0.0f ^ 0.0f; // expected-error {{invalid operands}}
int flai = 0.0f && 0; // expected-error {{invalid operands}}
int floi = 0.0f || 0; // expected-error {{invalid operands}}
float ibaf = 0 & 0.0f; // expected-error {{invalid operands}}
float ibof = 0 | 0.0f; // expected-error {{invalid operands}}
float bnf = ~0.0f; // expected-error {{invalid argument type}}
float lnf = !0.0f; // expected-error {{invalid argument type}}
}
kernel void vec_float_ops() {
float4 f4 = (float4)(0, 0, 0, 0);
int4 f4laf = f4 && 0.0f; // expected-error {{invalid operands}}
int4 f4lof = f4 || 0.0f; // expected-error {{invalid operands}}
float4 f4baf = f4 & 0.0f; // expected-error {{invalid operands}}
float4 f4bof = f4 | 0.0f; // expected-error {{invalid operands}}
float4 f4bxf = f4 ^ 0.0f; // expected-error {{invalid operands}}
float bnf4 = ~f4; // expected-error {{invalid argument type}}
int4 lnf4 = !f4; // expected-error {{invalid argument type}}
}
kernel void double_ops() {
int flaf = 0.0 && 0.0; // expected-error {{invalid operands}}
int flof = 0.0 || 0.0; // expected-error {{invalid operands}}
double fbaf = 0.0 & 0.0; // expected-error {{invalid operands}}
double fbof = 0.0 | 0.0; // expected-error {{invalid operands}}
double fbxf = 0.0 ^ 0.0; // expected-error {{invalid operands}}
int flai = 0.0 && 0; // expected-error {{invalid operands}}
int floi = 0.0 || 0; // expected-error {{invalid operands}}
double ibaf = 0 & 0.0; // expected-error {{invalid operands}}
double ibof = 0 | 0.0; // expected-error {{invalid operands}}
double bnf = ~0.0; // expected-error {{invalid argument type}}
double lnf = !0.0; // expected-error {{invalid argument type}}
}
kernel void vec_double_ops() {
double4 f4 = (double4)(0, 0, 0, 0);
long4 f4laf = f4 && 0.0; // expected-error {{invalid operands}}
long4 f4lof = f4 || 0.0; // expected-error {{invalid operands}}
double4 f4baf = f4 & 0.0; // expected-error {{invalid operands}}
double4 f4bof = f4 | 0.0; // expected-error {{invalid operands}}
double4 f4bxf = f4 ^ 0.0; // expected-error {{invalid operands}}
double bnf4 = ~f4; // expected-error {{invalid argument type}}
long4 lnf4 = !f4; // expected-error {{invalid argument type}}
}
test/SemaOpenCL/invalid-logical-ops-1.2.cl → test/SemaOpenCL/logical-ops.cl
View file @ d9ff11a2
// RUN: %clang_cc1 %s -verify -cl-std=CL1.1 -triple x86_64-unknown-linux-gnu
// RUN: %clang_cc1 %s -verify -cl-std=CL1.2 -triple x86_64-unknown-linux-gnu
// RUN: %clang_cc1 %s -verify -cl-std=CL2.0 -triple x86_64-unknown-linux-gnu
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
......@@ -9,50 +11,107 @@ typedef __attribute__((ext_vector_type(4))) long long4;
kernel void float_ops() {
int flaf = 0.0f && 0.0f;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
int flof = 0.0f || 0.0f;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
float fbaf = 0.0f & 0.0f; // expected-error {{invalid operands}}
float fbof = 0.0f | 0.0f; // expected-error {{invalid operands}}
float fbxf = 0.0f ^ 0.0f; // expected-error {{invalid operands}}
int flai = 0.0f && 0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
int floi = 0.0f || 0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
float ibaf = 0 & 0.0f; // expected-error {{invalid operands}}
float ibof = 0 | 0.0f; // expected-error {{invalid operands}}
float bnf = ~0.0f;// expected-error {{invalid argument type}}
float lnf = !0.0f;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid argument type}}
#endif
}
kernel void vec_float_ops() {
float4 f4 = (float4)(0, 0, 0, 0);
int4 f4laf = f4 && 0.0f;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
int4 f4lof = f4 || 0.0f;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
float4 f4baf = f4 & 0.0f; // expected-error {{invalid operands}}
float4 f4bof = f4 | 0.0f; // expected-error {{invalid operands}}
float4 f4bxf = f4 ^ 0.0f; // expected-error {{invalid operands}}
float bnf4 = ~f4; // expected-error {{invalid argument type}}
int4 lnf4 = !f4;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid argument type}}
#endif
}
kernel void double_ops() {
int flaf = 0.0 && 0.0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
int flof = 0.0 || 0.0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
double fbaf = 0.0 & 0.0; // expected-error {{invalid operands}}
double fbof = 0.0 | 0.0; // expected-error {{invalid operands}}
double fbxf = 0.0 ^ 0.0; // expected-error {{invalid operands}}
int flai = 0.0 && 0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
int floi = 0.0 || 0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
double ibaf = 0 & 0.0; // expected-error {{invalid operands}}
double ibof = 0 | 0.0; // expected-error {{invalid operands}}
double bnf = ~0.0; // expected-error {{invalid argument type}}
double lnf = !0.0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid argument type}}
#endif
}
kernel void vec_double_ops() {
double4 f4 = (double4)(0, 0, 0, 0);
long4 f4laf = f4 && 0.0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
long4 f4lof = f4 || 0.0;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid operands}}
#endif
double4 f4baf = f4 & 0.0; // expected-error {{invalid operands}}
double4 f4bof = f4 | 0.0; // expected-error {{invalid operands}}
double4 f4bxf = f4 ^ 0.0; // expected-error {{invalid operands}}
double bnf4 = ~f4; // expected-error {{invalid argument type}}
long4 lnf4 = !f4;
#if __OPENCL_C_VERSION__ < 120
// expected-error@-2{{invalid argument type}}
#endif
}
kernel void pointer_ops(){
global int* p;
bool b = !p;
b = p==0;
int i;
b = !&i;
b = &i==(int *)1;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment