diff options
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 94ddd0428d..d5378d30d5 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -98,9 +98,6 @@ void InitListChecker::CheckImplicitInitList(InitListExpr *ParentIList, void InitListChecker::CheckExplicitInitList(InitListExpr *IList, QualType &T, unsigned &Index) { assert(IList->isExplicit() && "Illegal Implicit InitListExpr"); - if (T->isScalarType()) - SemaRef->Diag(IList->getLocStart(), diag::warn_braces_around_scalar_init, - IList->getSourceRange()); CheckListElementTypes(IList, T, Index); IList->setType(T); @@ -120,6 +117,10 @@ void InitListChecker::CheckExplicitInitList(InitListExpr *IList, QualType &T, IList->getInit(Index)->getSourceRange()); } } + + if (!hadError && T->isScalarType()) + SemaRef->Diag(IList->getLocStart(), diag::warn_braces_around_scalar_init, + IList->getSourceRange()); } void InitListChecker::CheckListElementTypes(InitListExpr *IList, |