From ba2af70d9cfaddc5b8c2fa6e2a55387025b8f3ee Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 29 Jun 2017 10:47:23 +0000 Subject: [PATCH] Revert r306653, "[OpenCL] Allow function declaration with empty argument list." It broke bots. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@306660 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaType.cpp | 2 +- test/SemaOpenCL/function-no-args.cl | 9 --------- test/SemaOpenCL/invalid-pipes-cl2.0.cl | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 test/SemaOpenCL/function-no-args.cl diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index 465e8d146d..8c8402e75e 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -4355,7 +4355,7 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state, FunctionType::ExtInfo EI(getCCForDeclaratorChunk(S, D, FTI, chunkIndex)); - if (!FTI.NumParams && !FTI.isVariadic && !LangOpts.CPlusPlus && !LangOpts.OpenCL) { + if (!FTI.NumParams && !FTI.isVariadic && !LangOpts.CPlusPlus) { // Simple void foo(), where the incoming T is the result type. T = Context.getFunctionNoProtoType(T, EI); } else { diff --git a/test/SemaOpenCL/function-no-args.cl b/test/SemaOpenCL/function-no-args.cl deleted file mode 100644 index 12070a5858..0000000000 --- a/test/SemaOpenCL/function-no-args.cl +++ /dev/null @@ -1,9 +0,0 @@ -// RUN: %clang_cc1 -verify -pedantic -fsyntax-only -cl-std=CL2.0 %s -// expected-no-diagnostics - -global int gi; -int my_func(); -int my_func() { - gi = 2; - return gi; -} diff --git a/test/SemaOpenCL/invalid-pipes-cl2.0.cl b/test/SemaOpenCL/invalid-pipes-cl2.0.cl index 463fd3d0da..a50811650d 100644 --- a/test/SemaOpenCL/invalid-pipes-cl2.0.cl +++ b/test/SemaOpenCL/invalid-pipes-cl2.0.cl @@ -3,7 +3,7 @@ global pipe int gp; // expected-error {{type '__global read_only pipe int' can only be used as a function parameter in OpenCL}} global reserve_id_t rid; // expected-error {{the '__global reserve_id_t' type cannot be used to declare a program scope variable}} -extern pipe write_only int get_pipe(); // expected-error {{type '__global write_only pipe int (void)' can only be used as a function parameter in OpenCL}} +extern pipe write_only int get_pipe(); // expected-error {{type '__global write_only pipe int ()' can only be used as a function parameter in OpenCL}} kernel void test_invalid_reserved_id(reserve_id_t ID) { // expected-error {{'reserve_id_t' cannot be used as the type of a kernel parameter}} } -- 2.40.0