Changeset 48ec19a for src/Validate/LinkReferenceToTypes.cpp

Timestamp:

Jun 26, 2023, 10:51:47 AM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

917e1fd

Parents:

adc73a5 (diff), 1fbf481 (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

File:

• src/Validate/LinkReferenceToTypes.cpp (modified) (6 diffs)

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() ) {
@@ -266 +264 @@
 
 ast::TraitDecl const * LinkTypesCore::postvisit( ast::TraitDecl const * decl ) {
-        auto mut = ast::mutate( decl );
-        if ( mut->name == "sized" ) {
-                // "sized" is a special trait - flick the sized status on for the type variable.
-                assertf( mut->params.size() == 1, "Built-in trait 'sized' has incorrect number of parameters: %zd", decl->params.size() );
-                ast::TypeDecl * td = mut->params.front().get_and_mutate();
-                td->sized = true;
-        }
-
         // There is some overlap with code from decayForallPointers,
         // perhaps reorganization or shared helper functions are called for.
         // Move assertions from type parameters into the body of the trait.
+        auto mut = ast::mutate( decl );
         for ( ast::ptr<ast::TypeDecl> const & td : decl->params ) {
                 auto expanded = expandAssertions( td->assertions );