From 9068938eb0e5c46e506bb26fa8119bca2accf648 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 20 Dec 2016 10:05:04 +0000 Subject: [PATCH] Revert "[OpenCL] Enabling the usage of CLK_NULL_QUEUE as compare operand." This reverts commit r290171. It triggers a bunch of warnings, because the new enumerator isn't handled in all switches. We want a warning-free build. Replied on the commit with more details. llvm-svn: 290173 --- clang/include/clang/AST/OperationKinds.def | 3 -- clang/include/clang/Sema/Initialization.h | 5 --- clang/include/clang/Sema/Overload.h | 1 - clang/lib/AST/ExprConstant.cpp | 2 -- clang/lib/CodeGen/CGExprAgg.cpp | 1 - clang/lib/CodeGen/CGExprComplex.cpp | 1 - clang/lib/CodeGen/CGExprScalar.cpp | 5 --- clang/lib/Sema/SemaExpr.cpp | 12 ------- clang/lib/Sema/SemaExprCXX.cpp | 6 ---- clang/lib/Sema/SemaInit.cpp | 41 +--------------------- clang/lib/Sema/SemaOverload.cpp | 6 ---- clang/test/CodeGenOpenCL/null_queue.cl | 18 ---------- clang/test/SemaOpenCL/null_queue.cl | 12 ------- clang/test/SemaOpenCL/queue_t_overload.cl | 12 ------- 14 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 clang/test/CodeGenOpenCL/null_queue.cl delete mode 100644 clang/test/SemaOpenCL/null_queue.cl delete mode 100644 clang/test/SemaOpenCL/queue_t_overload.cl diff --git a/clang/include/clang/AST/OperationKinds.def b/clang/include/clang/AST/OperationKinds.def index 2d48a7df47b7..03a61e94e297 100644 --- a/clang/include/clang/AST/OperationKinds.def +++ b/clang/include/clang/AST/OperationKinds.def @@ -321,9 +321,6 @@ CAST_OPERATION(BuiltinFnToFnPtr) // Convert a zero value for OpenCL event_t initialization. CAST_OPERATION(ZeroToOCLEvent) -// Convert a zero value for OpenCL queue_t initialization. -CAST_OPERATION(ZeroToOCLQueue) - // Convert a pointer to a different address space. CAST_OPERATION(AddressSpaceConversion) diff --git a/clang/include/clang/Sema/Initialization.h b/clang/include/clang/Sema/Initialization.h index a7b8cce32691..c2795fcaf3a4 100644 --- a/clang/include/clang/Sema/Initialization.h +++ b/clang/include/clang/Sema/Initialization.h @@ -751,8 +751,6 @@ public: SK_StdInitializerListConstructorCall, /// \brief Initialize an OpenCL sampler from an integer. SK_OCLSamplerInit, - /// \brief Initialize queue_t from 0. - SK_OCLZeroQueue, /// \brief Passing zero to a function where OpenCL event_t is expected. SK_OCLZeroEvent }; @@ -1150,9 +1148,6 @@ public: /// constant. void AddOCLZeroEventStep(QualType T); - /// \brief Add a step to initialize an OpenCL queue_t from 0. - void AddOCLZeroQueueStep(QualType T); - /// \brief Add steps to unwrap a initializer list for a reference around a /// single element and rewrap it at the end. void RewrapReferenceInitList(QualType T, InitListExpr *Syntactic); diff --git a/clang/include/clang/Sema/Overload.h b/clang/include/clang/Sema/Overload.h index 9771044a075c..7c6699aca01d 100644 --- a/clang/include/clang/Sema/Overload.h +++ b/clang/include/clang/Sema/Overload.h @@ -83,7 +83,6 @@ namespace clang { ICK_TransparentUnionConversion, ///< Transparent Union Conversions ICK_Writeback_Conversion, ///< Objective-C ARC writeback conversion ICK_Zero_Event_Conversion, ///< Zero constant to event (OpenCL1.2 6.12.10) - ICK_Zero_Queue_Conversion, ///< Zero constant to queue ICK_C_Only_Conversion, ///< Conversions allowed in C, but not C++ ICK_Incompatible_Pointer_Conversion, ///< C-only conversion between pointers /// with incompatible types diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index c7310a8feb5d..0abdaa879ec2 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -8340,7 +8340,6 @@ bool IntExprEvaluator::VisitCastExpr(const CastExpr *E) { case CK_IntegralComplexToFloatingComplex: case CK_BuiltinFnToFnPtr: case CK_ZeroToOCLEvent: - case CK_ZeroToOCLQueue: case CK_NonAtomicToAtomic: case CK_AddressSpaceConversion: case CK_IntToOCLSampler: @@ -8838,7 +8837,6 @@ bool ComplexExprEvaluator::VisitCastExpr(const CastExpr *E) { case CK_CopyAndAutoreleaseBlockObject: case CK_BuiltinFnToFnPtr: case CK_ZeroToOCLEvent: - case CK_ZeroToOCLQueue: case CK_NonAtomicToAtomic: case CK_AddressSpaceConversion: case CK_IntToOCLSampler: diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index 009244784e50..35148bea0019 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -751,7 +751,6 @@ void AggExprEmitter::VisitCastExpr(CastExpr *E) { case CK_CopyAndAutoreleaseBlockObject: case CK_BuiltinFnToFnPtr: case CK_ZeroToOCLEvent: - case CK_ZeroToOCLQueue: case CK_AddressSpaceConversion: case CK_IntToOCLSampler: llvm_unreachable("cast kind invalid for aggregate types"); diff --git a/clang/lib/CodeGen/CGExprComplex.cpp b/clang/lib/CodeGen/CGExprComplex.cpp index 59bc9cdbc056..60bbc5cfac1e 100644 --- a/clang/lib/CodeGen/CGExprComplex.cpp +++ b/clang/lib/CodeGen/CGExprComplex.cpp @@ -480,7 +480,6 @@ ComplexPairTy ComplexExprEmitter::EmitCast(CastKind CK, Expr *Op, case CK_CopyAndAutoreleaseBlockObject: case CK_BuiltinFnToFnPtr: case CK_ZeroToOCLEvent: - case CK_ZeroToOCLQueue: case CK_AddressSpaceConversion: case CK_IntToOCLSampler: llvm_unreachable("invalid cast kind for complex value"); diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 1b85c45cd4be..e9bdbda34aa6 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -1593,11 +1593,6 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) { return llvm::Constant::getNullValue(ConvertType(DestTy)); } - case CK_ZeroToOCLQueue: { - assert(DestTy->isQueueT() && "CK_ZeroToOCLQueue cast on non queue_t type"); - return llvm::Constant::getNullValue(ConvertType(DestTy)); - } - case CK_IntToOCLSampler: return CGF.CGM.createOpenCLIntToSamplerConversion(E, CGF); diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 3c554c9a5244..b88834569113 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9635,18 +9635,6 @@ QualType Sema::CheckCompareOperands(ExprResult &LHS, ExprResult &RHS, return ResultTy; } - if (getLangOpts().OpenCLVersion >= 200) { - if (LHSIsNull && RHSType->isQueueT()) { - LHS = ImpCastExprToType(LHS.get(), RHSType, CK_NullToPointer); - return ResultTy; - } - - if (LHSType->isQueueT() && RHSIsNull) { - RHS = ImpCastExprToType(RHS.get(), LHSType, CK_NullToPointer); - return ResultTy; - } - } - return InvalidOperands(Loc, LHS, RHS); } diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 6967a4babd6f..74beeac72441 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -3878,12 +3878,6 @@ Sema::PerformImplicitConversion(Expr *From, QualType ToType, From->getValueKind()).get(); break; - case ICK_Zero_Queue_Conversion: - From = ImpCastExprToType(From, ToType, - CK_ZeroToOCLQueue, - From->getValueKind()).get(); - break; - case ICK_Lvalue_To_Rvalue: case ICK_Array_To_Pointer: case ICK_Function_To_Pointer: diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 895ccb54844b..ce012896f5bf 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -3077,7 +3077,6 @@ void InitializationSequence::Step::Destroy() { case SK_StdInitializerListConstructorCall: case SK_OCLSamplerInit: case SK_OCLZeroEvent: - case SK_OCLZeroQueue: break; case SK_ConversionSequence: @@ -3366,13 +3365,6 @@ void InitializationSequence::AddOCLZeroEventStep(QualType T) { Steps.push_back(S); } -void InitializationSequence::AddOCLZeroQueueStep(QualType T) { - Step S; - S.Kind = SK_OCLZeroQueue; - S.Type = T; - Steps.push_back(S); -} - void InitializationSequence::RewrapReferenceInitList(QualType T, InitListExpr *Syntactic) { assert(Syntactic->getNumInits() == 1 && @@ -5038,20 +5030,6 @@ static bool TryOCLZeroEventInitialization(Sema &S, return true; } -static bool TryOCLZeroQueueInitialization(Sema &S, - InitializationSequence &Sequence, - QualType DestType, - Expr *Initializer) { - if (!S.getLangOpts().OpenCL || S.getLangOpts().OpenCLVersion < 200 || - !DestType->isQueueT() || - !Initializer->isIntegerConstantExpr(S.getASTContext()) || - (Initializer->EvaluateKnownConstInt(S.getASTContext()) != 0)) - return false; - - Sequence.AddOCLZeroQueueStep(DestType); - return true; -} - InitializationSequence::InitializationSequence(Sema &S, const InitializedEntity &Entity, const InitializationKind &Kind, @@ -5314,9 +5292,6 @@ void InitializationSequence::InitializeFrom(Sema &S, if (TryOCLZeroEventInitialization(S, *this, DestType, Initializer)) return; - if (TryOCLZeroQueueInitialization(S, *this, DestType, Initializer)) - return; - // Handle initialization in C AddCAssignmentStep(DestType); MaybeProduceObjCObject(S, *this, Entity); @@ -6554,8 +6529,7 @@ InitializationSequence::Perform(Sema &S, case SK_ProduceObjCObject: case SK_StdInitializerList: case SK_OCLSamplerInit: - case SK_OCLZeroEvent: - case SK_OCLZeroQueue: { + case SK_OCLZeroEvent: { assert(Args.size() == 1); CurInit = Args[0]; if (!CurInit.get()) return ExprError(); @@ -7239,15 +7213,6 @@ InitializationSequence::Perform(Sema &S, CurInit.get()->getValueKind()); break; } - case SK_OCLZeroQueue: { - assert(Step->Type->isQueueT() && - "Event initialization on non queue type."); - - CurInit = S.ImpCastExprToType(CurInit.get(), Step->Type, - CK_ZeroToOCLQueue, - CurInit.get()->getValueKind()); - break; - } } } @@ -8076,10 +8041,6 @@ void InitializationSequence::dump(raw_ostream &OS) const { case SK_OCLZeroEvent: OS << "OpenCL event_t from zero"; break; - - case SK_OCLZeroQueue: - OS << "OpenCL queue_t from zero"; - break; } OS << " [" << S->Type.getAsString() << ']'; diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index c8a45013e9e1..d49142b8d853 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -1785,11 +1785,6 @@ static bool IsStandardConversion(Sema &S, Expr* From, QualType ToType, From->EvaluateKnownConstInt(S.getASTContext()) == 0) { SCS.Second = ICK_Zero_Event_Conversion; FromType = ToType; - } else if (ToType->isQueueT() && - From->isIntegerConstantExpr(S.getASTContext()) && - (From->EvaluateKnownConstInt(S.getASTContext()) == 0)) { - SCS.Second = ICK_Zero_Queue_Conversion; - FromType = ToType; } else { // No second conversion required. SCS.Second = ICK_Identity; @@ -5167,7 +5162,6 @@ static bool CheckConvertedConstantConversions(Sema &S, case ICK_Function_Conversion: case ICK_Integral_Promotion: case ICK_Integral_Conversion: // Narrowing conversions are checked elsewhere. - case ICK_Zero_Queue_Conversion: return true; case ICK_Boolean_Conversion: diff --git a/clang/test/CodeGenOpenCL/null_queue.cl b/clang/test/CodeGenOpenCL/null_queue.cl deleted file mode 100644 index cdcd7eef2ed4..000000000000 --- a/clang/test/CodeGenOpenCL/null_queue.cl +++ /dev/null @@ -1,18 +0,0 @@ -// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -emit-llvm %s -o - | FileCheck %s -extern queue_t get_default_queue(); - -bool compare() { - return 0 == get_default_queue() && - get_default_queue() == 0; - // CHECK: icmp eq %opencl.queue_t* null, %{{.*}} - // CHECK: icmp eq %opencl.queue_t* %{{.*}}, null -} - -void func(queue_t q); - -void init() { - queue_t q = 0; - func(0); - // CHECK: store %opencl.queue_t* null, %opencl.queue_t** %q - // CHECK: call void @func(%opencl.queue_t* null) -} diff --git a/clang/test/SemaOpenCL/null_queue.cl b/clang/test/SemaOpenCL/null_queue.cl deleted file mode 100644 index 518f7138de6c..000000000000 --- a/clang/test/SemaOpenCL/null_queue.cl +++ /dev/null @@ -1,12 +0,0 @@ -// RUN: %clang_cc1 %s -cl-std=CL2.0 -verify -pedantic -fsyntax-only -extern queue_t get_default_queue(); - -bool compare() { - return 1 == get_default_queue() && // expected-error{{invalid operands to binary expression ('int' and 'queue_t')}} - get_default_queue() == 1; // expected-error{{invalid operands to binary expression ('queue_t' and 'int')}} -} - -void init() { - queue_t q1 = 1; // expected-error{{initializing 'queue_t' with an expression of incompatible type 'int'}} - queue_t q = 0; -} diff --git a/clang/test/SemaOpenCL/queue_t_overload.cl b/clang/test/SemaOpenCL/queue_t_overload.cl deleted file mode 100644 index 0048895ac805..000000000000 --- a/clang/test/SemaOpenCL/queue_t_overload.cl +++ /dev/null @@ -1,12 +0,0 @@ -// RUN: %clang_cc1 %s -cl-std=CL2.0 -verify -pedantic -fsyntax-only - -void __attribute__((overloadable)) foo(queue_t, __local char *); // expected-note {{candidate function not viable: no known conversion from 'int' to 'queue_t' for 1st argument}} // expected-note {{candidate function}} -void __attribute__((overloadable)) foo(queue_t, __local float *); // expected-note {{candidate function not viable: no known conversion from 'int' to 'queue_t' for 1st argument}} // expected-note {{candidate function}} - -void kernel ker(__local char *src1, __local float *src2, __global int *src3) { - queue_t q; - foo(q, src1); - foo(0, src2); - foo(q, src3); // expected-error {{call to 'foo' is ambiguous}} - foo(1, src3); // expected-error {{no matching function for call to 'foo'}} -}