Improvements to code-generation and semantic analysis of designated
initializers.
- We now initialize unions properly when a member other than the
first is named by a designated initializer.
- We now provide proper semantic analysis and code generation for
GNU array-range designators *except* that side effects will occur
more than once. We warn about this.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63253 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index 2534a14..075a12c 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -454,10 +454,17 @@
if (Field->getType()->isIncompleteArrayType())
break;
- if (Field->getIdentifier() == 0) {
- // Initializers can't initialize unnamed fields, e.g. "int : 20;"
+ if (Field->isUnnamedBitfield())
continue;
- }
+
+ // When we're coping with C99 designated initializers into a
+ // union, find the field that has the same type as the expression
+ // we're initializing the union with.
+ if (isUnion && CurInitVal < NumInitElements &&
+ (CGF.getContext().getCanonicalType(Field->getType()) !=
+ CGF.getContext().getCanonicalType(E->getInit(CurInitVal)->getType())))
+ continue;
+
// FIXME: volatility
LValue FieldLoc = CGF.EmitLValueForField(DestPtr, *Field, isUnion,0);
if (CurInitVal < NumInitElements) {
@@ -471,8 +478,6 @@
}
// Unions only initialize one field.
- // (FIXME: things can get weird with designators, but they aren't
- // supported yet.)
if (isUnion)
break;
}