r345825 - Allow clk_event_t comparisons

[Sven van Haastregt via cfe-commits]

Author: svenvh
Date: Thu Nov  1 05:43:00 2018
New Revision: 345825

URL: http://llvm.org/viewvc/llvm-project?rev=345825&view=rev
Log:
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

Added:
    cfe/trunk/test/SemaOpenCL/clk_event_t.cl
Removed:
    cfe/trunk/test/SemaOpenCL/invalid-clk-events-cl2.0.cl
Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=345825&r1=345824&r2=345825&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Nov  1 05:43:00 2018
@@ -10497,6 +10497,10 @@ QualType Sema::CheckCompareOperands(Expr
   }
 
   if (getLangOpts().OpenCLVersion >= 200) {
+    if (LHSType->isClkEventT() && RHSType->isClkEventT()) {
+      return computeResultTy();
+    }
+
     if (LHSType->isQueueT() && RHSType->isQueueT()) {
       return computeResultTy();
     }

Added: cfe/trunk/test/SemaOpenCL/clk_event_t.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/clk_event_t.cl?rev=345825&view=auto
==============================================================================
--- cfe/trunk/test/SemaOpenCL/clk_event_t.cl (added)
+++ cfe/trunk/test/SemaOpenCL/clk_event_t.cl Thu Nov  1 05:43:00 2018
@@ -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;
+}

Removed: cfe/trunk/test/SemaOpenCL/invalid-clk-events-cl2.0.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/invalid-clk-events-cl2.0.cl?rev=345824&view=auto
==============================================================================
--- cfe/trunk/test/SemaOpenCL/invalid-clk-events-cl2.0.cl (original)
+++ cfe/trunk/test/SemaOpenCL/invalid-clk-events-cl2.0.cl (removed)
@@ -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}}