Changeset da0edec

Timestamp:

Jun 20, 2023, 4:14:32 PM (15 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

2de175ce

Parents:

9c4330d5 (diff), caf06aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• src/Validate/GenericParameter.cpp (modified) (2 diffs)
• tests/.expect/polybits.txt (added)
• tests/polybits.cfa (added)

src/Validate/GenericParameter.cpp

@@ -120 +120 @@
 }
 
-struct ValidateGenericParamsCore : public ast::WithCodeLocation {
+bool isSizedPolymorphic( const ast::AggregateDecl * decl ) {
+        for ( const auto & param : decl->params ) {
+                if ( param->sized ) return true;
+        }
+        return false;
+}
+
+struct ValidateGenericParamsCore :
+                public ast::WithCodeLocation, public ast::WithGuards {
+        // Generic parameter filling and checks:
         const ast::StructInstType * previsit( const ast::StructInstType * type ) {
                 assert( location );
@@ -129 +138 @@
                 assert( location );
                 return validateGeneric( *location, type );
+        }
+
+        // Check parameter and bitfield combinations:
+        bool insideSized = false;
+        void previsit( const ast::StructDecl * decl ) {
+                if ( isSizedPolymorphic( decl ) && !insideSized ) {
+                        GuardValue( insideSized ) = true;
+                }
+        }
+
+        void previsit( const ast::UnionDecl * decl ) {
+                if ( isSizedPolymorphic( decl ) && !insideSized ) {
+                        GuardValue( insideSized ) = true;
+                }
+        }
+
+        void previsit( const ast::ObjectDecl * decl ) {
+                if ( insideSized && decl->bitfieldWidth ) {
+                        SemanticError( decl->location, decl,
+                                "Cannot have bitfields inside a sized polymorphic structure." );
+                }
         }
 };