From 380b0bc33d296e60b32c98bb3571b05ffeeb78d2 Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Thu, 1 Nov 2018 12:43:00 +0000 Subject: [PATCH] Allow clk_event_t comparisons Also rename `invalid-clk-events-cl2.0.cl` to `clk_event_t.cl` and repurpose it to include both positive and negative clk_event_t tests. Differential Revision: https://reviews.llvm.org/D53871 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@345825 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 4 ++++ test/SemaOpenCL/clk_event_t.cl | 25 +++++++++++++++++++++ test/SemaOpenCL/invalid-clk-events-cl2.0.cl | 3 --- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 test/SemaOpenCL/clk_event_t.cl delete mode 100644 test/SemaOpenCL/invalid-clk-events-cl2.0.cl diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 8e04ae888b..ecda5be877 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -10497,6 +10497,10 @@ QualType Sema::CheckCompareOperands(ExprResult &LHS, ExprResult &RHS, } if (getLangOpts().OpenCLVersion >= 200) { + if (LHSType->isClkEventT() && RHSType->isClkEventT()) { + return computeResultTy(); + } + if (LHSType->isQueueT() && RHSType->isQueueT()) { return computeResultTy(); } diff --git a/test/SemaOpenCL/clk_event_t.cl b/test/SemaOpenCL/clk_event_t.cl new file mode 100644 index 0000000000..b73daf92fa --- /dev/null +++ b/test/SemaOpenCL/clk_event_t.cl @@ -0,0 +1,25 @@ +// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0 + +// Taken from opencl-c.h +#define CLK_NULL_EVENT (__builtin_astype(((void*)(__SIZE_MAX__)), clk_event_t)) + +global clk_event_t ce; // expected-error {{the '__global clk_event_t' type cannot be used to declare a program scope variable}} + +int clk_event_tests() { + event_t e; + clk_event_t ce1; + clk_event_t ce2; + + if (e == ce1) { // expected-error {{invalid operands to binary expression ('event_t' and 'clk_event_t')}} + return 9; + } + + if (ce1 != ce2) { + return 1; + } + else if (ce1 == CLK_NULL_EVENT || ce2 != CLK_NULL_EVENT) { + return 0; + } + + return 2; +} diff --git a/test/SemaOpenCL/invalid-clk-events-cl2.0.cl b/test/SemaOpenCL/invalid-clk-events-cl2.0.cl deleted file mode 100644 index 8c8e1c6176..0000000000 --- a/test/SemaOpenCL/invalid-clk-events-cl2.0.cl +++ /dev/null @@ -1,3 +0,0 @@ -// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0 - -global clk_event_t ce; // expected-error {{the '__global clk_event_t' type cannot be used to declare a program scope variable}} -- 2.50.1