diff options
| -rw-r--r-- | lib/Sema/Sema.h | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index f630e1d6fb..f7d66daf20 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -2641,11 +2641,9 @@ public: /// type checking declaration initializers (C99 6.7.8) - /// FIXME: The VarDecl parameter should not have a default value, - /// and all call sites should be audited. bool CheckInitializerTypes(Expr *&simpleInit_or_initList, QualType &declType, SourceLocation InitLoc,DeclarationName InitEntity, - bool DirectInit, VarDecl *VD = 0); + bool DirectInit); bool CheckInitList(InitListExpr *&InitList, QualType &DeclType); bool CheckForConstantInitializer(Expr *e, QualType t); diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 550a1441ac..3ea0b41622 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2551,7 +2551,7 @@ void Sema::AddInitializerToDecl(DeclPtrTy dcl, ExprArg init, bool DirectInit) { VDecl->setInvalidDecl(); } else if (!VDecl->isInvalidDecl()) { if (CheckInitializerTypes(Init, DclT, VDecl->getLocation(), - VDecl->getDeclName(), DirectInit, VDecl)) + VDecl->getDeclName(), DirectInit)) VDecl->setInvalidDecl(); // C++ 3.6.2p2, allow dynamic initialization of static initializers. diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 6f71e1b3f7..20c712fa29 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -119,8 +119,7 @@ static void CheckStringInit(Expr *Str, QualType &DeclT, Sema &S) { bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType, SourceLocation InitLoc, - DeclarationName InitEntity, - bool DirectInit, VarDecl *VD) { + DeclarationName InitEntity, bool DirectInit) { if (DeclType->isDependentType() || Init->isTypeDependent() || Init->isValueDependent()) return false; @@ -175,10 +174,8 @@ bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType, if (!Constructor) return true; - // FIXME: What do do if VD is null here? - if (VD) - Init = CXXConstructExpr::Create(Context, VD, DeclType, Constructor, - false, &Init, 1); + Init = CXXConstructExpr::Create(Context, 0, DeclType, Constructor, + false, &Init, 1); return false; } |