Changes in src/Validate/GenericParameter.cpp [0b0a285:caf06aa]

File:

• src/Validate/GenericParameter.cpp (modified) (3 diffs)

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." );
+                }
         }
 };
@@ -247 +277 @@
 const ast::Expr * TranslateDimensionCore::postvisit(
                 const ast::TypeExpr * expr ) {
-        if ( auto instType = dynamic_cast<const ast::EnumInstType *>( expr->type.get() ) ) {
-                const ast::EnumDecl * baseEnum = instType->base.get();
-                return ast::ConstantExpr::from_int( expr->location, baseEnum->members.size() );
-        }
+        // Does nothing, except prevents matching ast::Expr (above).
         return expr;
 }