diff options
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 6 | ||||
| -rw-r--r-- | clang/test/SemaOpenCL/block-array-capturing.cl | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 45510da0b1a..5bf7098dfa2 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -14627,8 +14627,10 @@ static bool captureInBlock(BlockScopeInfo *BSI, VarDecl *Var, Expr *CopyExpr = nullptr; bool ByRef = false; - // Blocks are not allowed to capture arrays. - if (CaptureType->isArrayType()) { + // Blocks are not allowed to capture arrays, excepting OpenCL. + // OpenCL v2.0 s1.12.5 (revision 40): arrays are captured by reference + // (decayed to pointers). + if (!S.getLangOpts().OpenCL && CaptureType->isArrayType()) { if (BuildAndDiagnose) { S.Diag(Loc, diag::err_ref_array_type); S.Diag(Var->getLocation(), diag::note_previous_decl) diff --git a/clang/test/SemaOpenCL/block-array-capturing.cl b/clang/test/SemaOpenCL/block-array-capturing.cl new file mode 100644 index 00000000000..2e922ad1f1f --- /dev/null +++ b/clang/test/SemaOpenCL/block-array-capturing.cl @@ -0,0 +1,16 @@ +// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple spir64-unkown-unkown -emit-llvm %s -o -| FileCheck %s +// expected-no-diagnostics + +typedef int (^block_t)(); + +int block_typedef_kernel(global int* res) { + // CHECK: %{{.*}} = alloca <{ i32, i32, [3 x i32] }> + int a[3] = {1, 2, 3}; + // CHECK: call void @llvm.memcpy{{.*}} + block_t b = ^() { return a[0]; }; + return b(); +} + +// CHECK: define {{.*}} @__block_typedef_kernel_block_invoke +// CHECK: %{{.*}} = getelementptr inbounds [3 x i32], [3 x i32] addrspace(4)* %{{.*}}, i64 0, i64 0 +// CHECK-NOT: call void @llvm.memcpy{{.*}} |
