bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2246 from acqn/ArrayFix

Browse Source 
[cc65] Fixes for nested unspecified-length/flexible arrays
This commit is contained in:
Bob Andrews
2023-10-29 12:10:30 +01:00
committed by GitHub
parent 65aad16d83 8e45a4c960
commit f7cf14bf58
6 changed files with 74 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc65/compile.c
View File

@@ -514,7 +514,7 @@ void Compile (const char* FileName)
/* Mark as defined; so that it will be exported, not imported */
Entry->Flags |= SC_DEF;
} else {
} else if (!IsTypeArray (Entry->Type)) {
/* Tentative declared variable is still of incomplete type */
Error ("Definition of '%s' has type '%s' that is never completed",
Entry->Name,

41
src/cc65/declare.c
View File

@@ -493,33 +493,36 @@ static void FixQualifiers (Type* DataType)
static void CheckArrayElementType (Type* DataType)
static void CheckArrayElementType (const Type* T)
/* Check if data type consists of arrays of incomplete element types */
{
Type* T = DataType;
while (T->C != T_END) {
if (IsTypeArray (T)) {
/* If the array is multi-dimensional, keep going until we get the
** true element type.
*/
++T;
if (IsIncompleteESUType (T)) {
/* We cannot have an array of incomplete elements */
Error ("Array of incomplete element type '%s'", GetFullTypeName (T));
} else if (SizeOf (T) == 0) {
/* If the array is multi-dimensional, try to get the true
** element type.
*/
if (IsTypeArray (T)) {
continue;
}
/* We could support certain 0-size element types as an extension */
if (!IsTypeVoid (T) || IS_Get (&Standard) != STD_CC65) {
Error ("Array of 0-size element type '%s'", GetFullTypeName (T));
if (SizeOf (T) == 0) {
if (IsTypeArray (T) || IsIncompleteESUType (T)) {
/* We cannot have an array of incomplete elements */
if (!IsTypeArray (T) || GetElementCount (T) == UNSPECIFIED) {
Error ("Array of incomplete element type '%s'",
GetFullTypeName (T));
return;
}
} else if (!IsTypeVoid (T) || IS_Get (&Standard) != STD_CC65) {
/* We could support certain 0-size element types as an extension */
Error ("Array of 0-size element type '%s'",
GetFullTypeName (T));
return;
}
} else {
if (IsTypeStruct (T)) {
/* Elements cannot contain flexible array members themselves */
if (IsClassStruct (T)) {
SymEntry* TagEntry = GetESUTagSym (T);
if (TagEntry && SymHasFlexibleArrayMember (TagEntry)) {
Error ("Invalid use of struct with flexible array member");
return;
}
}
}
@@ -1200,9 +1203,7 @@ static SymEntry* ParseStructSpec (const char* Name, unsigned* DSFlags)
if (TagEntry && SymHasFlexibleArrayMember (TagEntry)) {
Field->Flags |= SC_HAVEFAM;
Flags |= SC_HAVEFAM;
if (IsTypeStruct (Decl.Type)) {
Error ("Invalid use of struct with flexible array member");
}
Error ("Invalid use of struct with flexible array member");
}
}