Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit ba7c29bebdd878671d3a5a7f8ba11b7c35176254 1 parent 6111a72
@emaste emaste authored
Showing with 10 additions and 5 deletions.
  1. +10 −5 contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
View
15 contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
@@ -774,6 +774,11 @@ void InitListChecker::CheckSubElementType(const InitializedEntity &Entity,
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::CheckSubElementType(const InitializedEntity &Entity,
// 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
Please sign in to comment.
Something went wrong with that request. Please try again.