aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.def6
-rw-r--r--lib/CodeGen/CGExprAgg.cpp15
-rw-r--r--lib/CodeGen/CGExprConstant.cpp12
-rw-r--r--lib/CodeGen/CodeGenTypes.cpp1
-rw-r--r--lib/Sema/Sema.h3
-rw-r--r--lib/Sema/SemaInit.cpp112
-rw-r--r--test/Sema/designated-initializers.c10
7 files changed, 106 insertions, 53 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def
index 222e39911b..6276d61211 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.def
+++ b/include/clang/Basic/DiagnosticSemaKinds.def
@@ -60,10 +60,8 @@ DIAG(warn_initializer_overrides, WARNING,
"initializer overrides prior initialization of this subobject")
DIAG(note_previous_initializer, NOTE,
"previous initialization %select{|with side effects }0is here%select{| (side effects may not occur at run time)}0")
-DIAG(warn_gnu_array_range_designator_unsupported, WARNING,
- "GNU array-range designator extension is unsupported")
-DIAG(warn_designator_into_union_broken_init, WARNING,
- "designated initialization of union member is broken")
+DIAG(warn_gnu_array_range_designator_side_effects, WARNING,
+ "side effects due to the GNU array-range designator extension may occur multiple times")
// Declarations.
DIAG(ext_vla, EXTENSION,
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index 2534a14cb6..075a12c57e 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -454,10 +454,17 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) {
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 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) {
}
// Unions only initialize one field.
- // (FIXME: things can get weird with designators, but they aren't
- // supported yet.)
if (isUnion)
break;
}
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 87868ed347..b05048c946 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -246,12 +246,22 @@ public:
// first field
int FieldNo = 0; // Field no in RecordDecl
FieldDecl* curField = 0;
+ bool sawAnyFields = false;
for (RecordDecl::field_iterator Field = RD->field_begin(),
FieldEnd = RD->field_end();
Field != FieldEnd; ++Field) {
curField = *Field;
FieldNo++;
- if (curField->getIdentifier())
+
+ if (curField->isUnnamedBitfield())
+ continue;
+
+ // If we have an initializer, find the field whose type is the
+ // same as that initializer. This
+ sawAnyFields = true;
+ if (ILE->getNumInits() > 0 &&
+ CGM.getContext().getCanonicalType(curField->getType()) ==
+ CGM.getContext().getCanonicalType(ILE->getInit(0)->getType()))
break;
}
diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index aac6e8d644..edd16087fd 100644
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -518,6 +518,7 @@ void RecordOrganizer::layoutUnionFields(const ASTRecordLayout &RL) {
Field != FieldEnd; ++Field) {
// The offset should usually be zero, but bitfields could be strange
uint64_t offset = RL.getFieldOffset(curField);
+ CGT.ConvertTypeRecursive(Field->getType());
if (Field->isBitField()) {
Expr *BitWidth = Field->getBitWidth();
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 8cf10ff3e2..9a4ab86871 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1879,7 +1879,8 @@ class InitListChecker {
llvm::APSInt *NextElementIndex,
unsigned &Index,
InitListExpr *StructuredList,
- unsigned &StructuredIndex);
+ unsigned &StructuredIndex,
+ bool FinishSubobjectInit = true);
InitListExpr *getStructuredSubobjectInit(InitListExpr *IList, unsigned Index,
QualType CurrentObjectType,
InitListExpr *StructuredList,
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 511a394d8f..a3c858d089 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -500,7 +500,7 @@ void InitListChecker::CheckStructUnionTypes(InitListExpr *IList,
CheckSubElementType(IList, Field->getType(), IList->getInit(Index), Index,
StructuredList, StructuredIndex);
- if (DeclType->isUnionType()) // FIXME: designated initializers?
+ if (DeclType->isUnionType())
break;
++Field;
@@ -554,7 +554,8 @@ InitListChecker::CheckDesignatedInitializer(InitListExpr *IList,
llvm::APSInt *NextElementIndex,
unsigned &Index,
InitListExpr *StructuredList,
- unsigned &StructuredIndex) {
+ unsigned &StructuredIndex,
+ bool FinishSubobjectInit) {
if (D == DIE->designators_end()) {
// Check the actual initialization for the designated object type.
bool prevHadError = hadError;
@@ -645,13 +646,8 @@ InitListChecker::CheckDesignatedInitializer(InitListExpr *IList,
// All of the fields of a union are located at the same place in
// the initializer list.
- // FIXME: Need to tell CodeGen which type to initialize to. ImplicitCastExpr?
- if (RT->getDecl()->isUnion() && FieldIndex != 0) {
- SemaRef->Diag(D->getStartLocation(),
- diag::warn_designator_into_union_broken_init)
- << SourceRange(D->getStartLocation(), DIE->getSourceRange().getEnd());
+ if (RT->getDecl()->isUnion())
FieldIndex = 0;
- }
// Update the designator with the field declaration.
D->setField(*Field);
@@ -682,6 +678,9 @@ InitListChecker::CheckDesignatedInitializer(InitListExpr *IList,
return false;
}
+ if (!FinishSubobjectInit)
+ return false;
+
// Check the remaining fields within this class/struct/union subobject.
bool prevHadError = hadError;
CheckStructUnionTypes(IList, CurrentObjectType, Field, false, Index,
@@ -713,63 +712,102 @@ InitListChecker::CheckDesignatedInitializer(InitListExpr *IList,
}
Expr *IndexExpr = 0;
- llvm::APSInt DesignatedIndex;
- if (D->isArrayDesignator())
+ llvm::APSInt DesignatedStartIndex, DesignatedEndIndex;
+ if (D->isArrayDesignator()) {
IndexExpr = DIE->getArrayIndex(*D);
- else {
+
+ bool ConstExpr
+ = IndexExpr->isIntegerConstantExpr(DesignatedStartIndex, SemaRef->Context);
+ assert(ConstExpr && "Expression must be constant"); (void)ConstExpr;
+
+ DesignatedEndIndex = DesignatedStartIndex;
+ } else {
assert(D->isArrayRangeDesignator() && "Need array-range designator");
+
+ bool StartConstExpr
+ = DIE->getArrayRangeStart(*D)->isIntegerConstantExpr(DesignatedStartIndex,
+ SemaRef->Context);
+ assert(StartConstExpr && "Expression must be constant"); (void)StartConstExpr;
+
+ bool EndConstExpr
+ = DIE->getArrayRangeEnd(*D)->isIntegerConstantExpr(DesignatedEndIndex,
+ SemaRef->Context);
+ assert(EndConstExpr && "Expression must be constant"); (void)EndConstExpr;
+
IndexExpr = DIE->getArrayRangeEnd(*D);
- SemaRef->Diag(D->getEllipsisLoc(),
- diag::warn_gnu_array_range_designator_unsupported)
- << SourceRange(D->getLBracketLoc(), D->getRBracketLoc());
+
+ if (DesignatedStartIndex.getZExtValue() != DesignatedEndIndex.getZExtValue())
+ SemaRef->Diag(D->getEllipsisLoc(),
+ diag::warn_gnu_array_range_designator_side_effects)
+ << SourceRange(D->getLBracketLoc(), D->getRBracketLoc());
}
- bool ConstExpr
- = IndexExpr->isIntegerConstantExpr(DesignatedIndex, SemaRef->Context);
- assert(ConstExpr && "Expression must be constant"); (void)ConstExpr;
-
if (isa<ConstantArrayType>(AT)) {
llvm::APSInt MaxElements(cast<ConstantArrayType>(AT)->getSize(), false);
- DesignatedIndex.extOrTrunc(MaxElements.getBitWidth());
- DesignatedIndex.setIsUnsigned(MaxElements.isUnsigned());
- if (DesignatedIndex >= MaxElements) {
+ DesignatedStartIndex.extOrTrunc(MaxElements.getBitWidth());
+ DesignatedStartIndex.setIsUnsigned(MaxElements.isUnsigned());
+ DesignatedEndIndex.extOrTrunc(MaxElements.getBitWidth());
+ DesignatedEndIndex.setIsUnsigned(MaxElements.isUnsigned());
+ if (DesignatedEndIndex >= MaxElements) {
SemaRef->Diag(IndexExpr->getSourceRange().getBegin(),
diag::err_array_designator_too_large)
- << DesignatedIndex.toString(10) << MaxElements.toString(10)
+ << DesignatedEndIndex.toString(10) << MaxElements.toString(10)
<< IndexExpr->getSourceRange();
++Index;
return true;
}
+ } else {
+ // Make sure the bit-widths and signedness match.
+ if (DesignatedStartIndex.getBitWidth() > DesignatedEndIndex.getBitWidth())
+ DesignatedEndIndex.extend(DesignatedStartIndex.getBitWidth());
+ else if (DesignatedStartIndex.getBitWidth() < DesignatedEndIndex.getBitWidth())
+ DesignatedStartIndex.extend(DesignatedEndIndex.getBitWidth());
+ DesignatedStartIndex.setIsUnsigned(true);
+ DesignatedEndIndex.setIsUnsigned(true);
}
// Make sure that our non-designated initializer list has space
// for a subobject corresponding to this array element.
- unsigned ElementIndex = DesignatedIndex.getZExtValue();
- if (ElementIndex >= StructuredList->getNumInits())
- StructuredList->resizeInits(SemaRef->Context, ElementIndex + 1);
-
- // Recurse to check later designated subobjects.
- QualType ElementType = AT->getElementType();
- if (CheckDesignatedInitializer(IList, DIE, ++D, ElementType, 0, 0, Index,
- StructuredList, ElementIndex))
- return true;
+ if (DesignatedEndIndex.getZExtValue() >= StructuredList->getNumInits())
+ StructuredList->resizeInits(SemaRef->Context,
+ DesignatedEndIndex.getZExtValue() + 1);
+
+ // Repeatedly perform subobject initializations in the range
+ // [DesignatedStartIndex, DesignatedEndIndex].
+
+ // Move to the next designator
+ unsigned ElementIndex = DesignatedStartIndex.getZExtValue();
+ unsigned OldIndex = Index;
+ ++D;
+ while (DesignatedStartIndex <= DesignatedEndIndex) {
+ // Recurse to check later designated subobjects.
+ QualType ElementType = AT->getElementType();
+ Index = OldIndex;
+ if (CheckDesignatedInitializer(IList, DIE, D, ElementType, 0, 0, Index,
+ StructuredList, ElementIndex,
+ (DesignatedStartIndex == DesignatedEndIndex)))
+ return true;
- // Move to the next index in the array that we'll be initializing.
- ++DesignatedIndex;
- ElementIndex = DesignatedIndex.getZExtValue();
+ // Move to the next index in the array that we'll be initializing.
+ ++DesignatedStartIndex;
+ ElementIndex = DesignatedStartIndex.getZExtValue();
+ }
// If this the first designator, our caller will continue checking
// the rest of this array subobject.
if (IsFirstDesignator) {
if (NextElementIndex)
- *NextElementIndex = DesignatedIndex;
+ *NextElementIndex = DesignatedStartIndex;
StructuredIndex = ElementIndex;
return false;
}
-
+
+ if (!FinishSubobjectInit)
+ return false;
+
// Check the remaining elements within this array subobject.
bool prevHadError = hadError;
- CheckArrayType(IList, CurrentObjectType, DesignatedIndex, true, Index,
+ CheckArrayType(IList, CurrentObjectType, DesignatedStartIndex, true, Index,
StructuredList, ElementIndex);
return hadError && !prevHadError;
}
diff --git a/test/Sema/designated-initializers.c b/test/Sema/designated-initializers.c
index c9a0aa7f05..db099dd178 100644
--- a/test/Sema/designated-initializers.c
+++ b/test/Sema/designated-initializers.c
@@ -19,7 +19,7 @@ int iarray2[10] = {
int iarray3[10] = {
[5 ... 12] = 2 // expected-error{{array designator index (12) exceeds array bounds (10)}}\
- // expected-warning{{GNU array-range designator extension is unsupported}}
+ // expected-warning{{side effects due to the GNU array-range designator extension may occur multiple times}}
};
struct point {
@@ -45,8 +45,8 @@ struct point array[10] = {
struct point array2[10] = {
[10].x = 2.0, // expected-error{{array designator index (10) exceeds array bounds (10)}}
- [4 ... 5].y = 2.0, // expected-warning{{GNU array-range designator extension is unsupported}}
- [4 ... 6] = { .x = 3, .y = 4.0 } // expected-warning{{GNU array-range designator extension is unsupported}}
+ [4 ... 5].y = 2.0, // expected-warning{{side effects due to the GNU array-range designator extension may occur multiple times}}
+ [4 ... 6] = { .x = 3, .y = 4.0 } // expected-warning{{side effects due to the GNU array-range designator extension may occur multiple times}}
};
struct point array3[10] = {
@@ -117,7 +117,7 @@ struct disklabel_ops disklabel64_ops = {
// PR clang/3378
int bitwidth[] = { [(long long int)1] = 5, [(short int)2] = 2 };
int a[]= { [sizeof(int)] = 0 };
-int a2[]= { [0 ... sizeof(int)] = 0 }; // expected-warning{{GNU array-range designator extension is unsupported}}
+int a2[]= { [0 ... sizeof(int)] = 0 }; // expected-warning{{side effects due to the GNU array-range designator extension may occur multiple times}}
// Test warnings about initializers overriding previous initializers
struct X {
@@ -138,4 +138,4 @@ void test() {
}
// FIXME: we need to
-union { char c; long l; } u1 = { .l = 0xFFFF }; // expected-warning{{designated initialization of union member is broken}}
+union { char c; long l; } u1 = { .l = 0xFFFF };
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-07-06 17:26:54 +0000