This is an archive of the discontinued LLVM Phabricator instance.

[OpenCL] Enable queue_t and clk_event_t comparisons in C++ mode
ClosedPublic

Authored by svenvh on May 21 2019, 10:07 AM.

Reviewers

Commits

Summary

Support queue_t and clk_event_t comparisons in C++ for OpenCL mode, to
preserve backwards compatibility with OpenCL C.

LGTM! Thanks!

This revision is now accepted and ready to land.May 22 2019, 8:23 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

Sema/

2 lines

test/

SemaOpenCL/

1 line

Show First 20 Lines • Show All 10,802 Lines • ▼ Show 20 Lines	if (!IsRelational && RHSIsNull
return computeResultTy();		return computeResultTy();
}		}
if (!IsRelational && LHSIsNull		if (!IsRelational && LHSIsNull
&& LHSType->isIntegerType() && RHSType->isBlockPointerType()) {		&& LHSType->isIntegerType() && RHSType->isBlockPointerType()) {
LHS = ImpCastExprToType(LHS.get(), RHSType, CK_NullToPointer);		LHS = ImpCastExprToType(LHS.get(), RHSType, CK_NullToPointer);
return computeResultTy();		return computeResultTy();
}		}

if (getLangOpts().OpenCLVersion >= 200) {		if (getLangOpts().OpenCLVersion >= 200 \|\| getLangOpts().OpenCLCPlusPlus) {
if (LHSType->isClkEventT() && RHSType->isClkEventT()) {		if (LHSType->isClkEventT() && RHSType->isClkEventT()) {
return computeResultTy();		return computeResultTy();
}		}

if (LHSType->isQueueT() && RHSType->isQueueT()) {		if (LHSType->isQueueT() && RHSType->isQueueT()) {
return computeResultTy();		return computeResultTy();
}		}

▲ Show 20 Lines • Show All 6,237 Lines • Show Last 20 Lines

	// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0			// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0
				// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++

	// Taken from opencl-c.h			// Taken from opencl-c.h
	#define CLK_NULL_EVENT (__builtin_astype(((void*)(__SIZE_MAX__)), clk_event_t))			#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}}			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() {			int clk_event_tests() {
	event_t e;			event_t e;
	Show All 16 Lines