Changeset c84dd61 for src/Validate

Timestamp:

Jun 21, 2023, 2:38:55 AM (16 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

92355883

Parents:

0b0a285 (diff), 2de175ce (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

Location:

src/Validate

Files:

• Autogen.cpp (modified) (4 diffs)
• GenericParameter.cpp (modified) (2 diffs)
• LinkReferenceToTypes.cpp (modified) (5 diffs)

src/Validate/Autogen.cpp

@@ -321 +321 @@
 void FuncGenerator::produceDecl( const ast::FunctionDecl * decl ) {
         assert( nullptr != decl->stmts );
+        assert( decl->type_params.size() == getGenericParams( type ).size() );
 
         definitions.push_back( decl );
@@ -356 +357 @@
                 decl->init = nullptr;
                 splice( assertions, decl->assertions );
-                oldToNew.emplace( std::make_pair( old_param, decl ) );
+                oldToNew.emplace( old_param, decl );
                 type_params.push_back( decl );
         }
@@ -522 +523 @@
         InitTweak::InitExpander_new srcParam( src );
         // Assign to destination.
-        ast::Expr * dstSelect = new ast::MemberExpr(
+        ast::MemberExpr * dstSelect = new ast::MemberExpr(
                 location,
                 field,
@@ -574 +575 @@
                 }
 
-                ast::Expr * srcSelect = (srcParam) ? new ast::MemberExpr(
+                ast::MemberExpr * srcSelect = (srcParam) ? new ast::MemberExpr(
                         location, field, new ast::VariableExpr( location, srcParam )
                 ) : nullptr;

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." );
+                }
         }
 };

src/Validate/LinkReferenceToTypes.cpp

@@ -84 +84 @@
                 // Just linking in the node.
                 auto mut = ast::mutate( type );
-                mut->base = const_cast<ast::EnumDecl *>( decl );
+                mut->base = decl;
                 type = mut;
         }
@@ -101 +101 @@
                 // Just linking in the node.
                 auto mut = ast::mutate( type );
-                mut->base = const_cast<ast::StructDecl *>( decl );
+                mut->base = decl;
                 type = mut;
         }
@@ -118 +118 @@
                 // Just linking in the node.
                 auto mut = ast::mutate( type );
-                mut->base = const_cast<ast::UnionDecl *>( decl );
+                mut->base = decl;
                 type = mut;
         }
@@ -141 +141 @@
 
         // Just linking in the node.
-        mut->base = const_cast<ast::TraitDecl *>( decl );
+        mut->base = decl;
 
         // Need to carry over the 'sized' status of each decl in the instance.
@@ -203 +203 @@
         }
 
-        // The following section 
-
         ForwardEnumsType::iterator fwds = forwardEnums.find( decl->name );
         if ( fwds != forwardEnums.end() ) {