replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[OPENCL] Fix wrongly vla error for OpenCL array." 

Test case break on system-z.

This reverts commit 9a7212e1e87f1396952d74f8c62314a775ccbb1c.

llvm-svn: 271975
This commit is contained in:
Xiuli Pan 2016-06-07 03:41:07 +00:00
parent 532dcbc2c5
commit a219552ca8
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/AST/ExprConstant.cpp
View File

@ -2745,10 +2745,7 @@ static CompleteObject findCompleteObject(EvalInfo &Info, const Expr *E,
} else if (VD->isConstexpr()) {
// OK, we can read this variable.
} else if (BaseType->isIntegralOrEnumerationType()) {
// In OpenCL if a variable is in constant address space it is a const value.
if (!(BaseType.isConstQualified() ||
(Info.getLangOpts().OpenCL &&
BaseType.getAddressSpace() == LangAS::opencl_constant))) {
if (!BaseType.isConstQualified()) {
if (Info.getLangOpts().CPlusPlus) {
Info.Diag(E, diag::note_constexpr_ltor_non_const_int, 1) << VD;
Info.Note(VD->getLocation(), diag::note_declared_at);

3
clang/lib/Sema/SemaType.cpp
View File

@ -2063,8 +2063,7 @@ static bool isArraySizeVLA(Sema &S, Expr *ArraySize, llvm::APSInt &SizeVal) {
} Diagnoser;
return S.VerifyIntegerConstantExpression(ArraySize, &SizeVal, Diagnoser,
S.LangOpts.GNUMode ||
S.LangOpts.OpenCL).isInvalid();
S.LangOpts.GNUMode).isInvalid();
}
/// \brief Build an array type.

18
clang/test/CodeGenOpenCL/vla.cl
View File

@ -1,18 +0,0 @@
// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -o - %s | FileCheck %s
constant int sz0 = 5;
// CHECK: @sz0 = constant i32 5, align 4
const global int sz1 = 16;
// CHECK: @sz1 = constant i32 16, align 4
const constant int sz2 = 8;
// CHECK: @sz2 = constant i32 8, align 4
// CHECK: @testvla.vla2 = internal global [8 x i16] undef, align 16
kernel void testvla()
{
int vla0[sz0];
// CHECK: %vla0 = alloca [5 x i32], align 16
char vla1[sz1];
// CHECK: %vla1 = alloca [16 x i8], align 16
local short vla2[sz2];
}