svn commit: r254786 - releng/9.2/contrib/llvm/tools/clang/lib/Sema

[Ed Maste]

Author: emaste
Date: Sat Aug 24 14:33:11 2013
New Revision: 254786
URL: http://svnweb.freebsd.org/changeset/base/254786

Log:
  MFS r254728:
  
    Pull in r182983 from upstream clang trunk:
  
      Fix handling of braced-init-list as reference initializer within
      aggregate initialization. Previously we would incorrectly require an
      extra set of braces around such initializers.
  
    Pull in r188718 from upstream clang trunk:
  
      Handle init lists and _Atomic fields.
  
      Fixes PR16931.
  
    These fixes are needed for the atomic_flag type to work correctly in our
    stdatomic.h.
  
  Approved by:	re

Modified:
  releng/9.2/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
Directory Properties:
  releng/9.2/contrib/llvm/tools/clang/   (props changed)

Modified: releng/9.2/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
==============================================================================
--- releng/9.2/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp	Sat Aug 24 13:58:17 2013	(r254785)
+++ releng/9.2/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp	Sat Aug 24 14:33:11 2013	(r254786)
@@ -774,6 +774,11 @@ void InitListChecker::CheckSubElementTyp
                                           InitListExpr *StructuredList,
                                           unsigned &StructuredIndex) {
   Expr *expr = IList->getInit(Index);
+
+  if (ElemType->isReferenceType())
+    return CheckReferenceType(Entity, IList, ElemType, Index,
+                              StructuredList, StructuredIndex);
+
   if (InitListExpr *SubInitList = dyn_cast<InitListExpr>(expr)) {
     if (!ElemType->isRecordType() || ElemType->isAggregateType()) {
       unsigned newIndex = 0;
@@ -793,13 +798,13 @@ void InitListChecker::CheckSubElementTyp
     // C++ initialization is handled later.
   }
 
-  if (ElemType->isScalarType()) {
+  // FIXME: Need to handle atomic aggregate types with implicit init lists.
+  if (ElemType->isScalarType() || ElemType->isAtomicType())
     return CheckScalarType(Entity, IList, ElemType, Index,
                            StructuredList, StructuredIndex);
-  } else if (ElemType->isReferenceType()) {
-    return CheckReferenceType(Entity, IList, ElemType, Index,
-                              StructuredList, StructuredIndex);
-  }
+
+  assert((ElemType->isRecordType() || ElemType->isVectorType() ||
+          ElemType->isArrayType()) && "Unexpected type");
 
   if (const ArrayType *arrayType = SemaRef.Context.getAsArrayType(ElemType)) {
     // arrayType can be incomplete if we're initializing a flexible