maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix a couple of bugs found by Neil Booth in the const-ness checking. 

llvm-svn: 51361
This commit is contained in:
Eli Friedman 2008-05-21 03:39:11 +00:00
parent bcfa2d75d7
commit 86346ede95
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/Sema/SemaDecl.cpp
View File

@ -1004,8 +1004,13 @@ bool Sema::CheckAddressConstantExpressionLValue(const Expr* Init) {
return cast<CompoundLiteralExpr>(Init)->isFileScope(); return cast<CompoundLiteralExpr>(Init)->isFileScope();
case Expr::DeclRefExprClass: { case Expr::DeclRefExprClass: {
const Decl *D = cast<DeclRefExpr>(Init)->getDecl(); const Decl *D = cast<DeclRefExpr>(Init)->getDecl();
if (const VarDecl *VD = dyn_cast<VarDecl>(D)) if (const VarDecl *VD = dyn_cast<VarDecl>(D)) {
return VD->hasGlobalStorage(); if (VD->hasGlobalStorage())
return false;
Diag(Init->getExprLoc(),
diag::err_init_element_not_constant, Init->getSourceRange());
return true;
}
if (isa<FunctionDecl>(D)) if (isa<FunctionDecl>(D))
return false; return false;
Diag(Init->getExprLoc(), Diag(Init->getExprLoc(),
@ -1032,7 +1037,7 @@ bool Sema::CheckAddressConstantExpressionLValue(const Expr* Init) {
// C99 6.6p9 // C99 6.6p9
if (Exp->getOpcode() == UnaryOperator::Deref) if (Exp->getOpcode() == UnaryOperator::Deref)
return CheckAddressConstantExpressionLValue(Exp->getSubExpr()); return CheckAddressConstantExpression(Exp->getSubExpr());
Diag(Init->getExprLoc(), Diag(Init->getExprLoc(),
diag::err_init_element_not_constant, Init->getSourceRange()); diag::err_init_element_not_constant, Init->getSourceRange());

12
clang/test/Sema/init.c
View File

@ -30,3 +30,15 @@ struct cdiff_cmd commands[] = {
{"OPEN", 1, &cdiff_cmd_open } {"OPEN", 1, &cdiff_cmd_open }
}; };
// PR2348
static struct { int z; } s[2];
int *t = &(*s).z;
// PR2349
short *a2(void)
{
short int b;
static short *bp = &b; // expected-error {{initializer element is not constant}}
return bp;
}