Changeset 713905fd for src/Validate

Timestamp:

Jul 10, 2023, 11:14:13 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

c3f7dd9

Parents:

e6e1a12 (diff), b29a1e8 (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) (1 diff)

src/Validate/LinkReferenceToTypes.cpp

@@ -80 +80 @@
 ast::EnumInstType const * LinkTypesCore::postvisit( ast::EnumInstType const * type ) {
         ast::EnumDecl const * decl = symtab.lookupEnum( type->name );
+        ast::EnumInstType * mut = ast::mutate( type );
         // It's not a semantic error if the enum is not found, just an implicit forward declaration.
         if ( decl ) {
                 // Just linking in the node.
-                auto mut = ast::mutate( type );
                 mut->base = decl;
-                type = mut;
         }
         if ( !decl || !decl->body ) {
-                auto mut = ast::mutate( type );
                 forwardEnums[ mut->name ].push_back( mut );
-                type = mut;
-        }
-        return type;
+        }
+        return mut;
 }
 
 ast::StructInstType const * LinkTypesCore::postvisit( ast::StructInstType const * type ) {
         ast::StructDecl const * decl = symtab.lookupStruct( type->name );
+        ast::StructInstType * mut = ast::mutate( type );
         // It's not a semantic error if the struct is not found, just an implicit forward declaration.
         if ( decl ) {
                 // Just linking in the node.
-                auto mut = ast::mutate( type );
                 mut->base = decl;
-                type = mut;
         }
         if ( !decl || !decl->body ) {
-                auto mut = ast::mutate( type );
                 forwardStructs[ mut->name ].push_back( mut );
-                type = mut;
-        }
-        return type;
+        }
+        return mut;
 }
 
 ast::UnionInstType const * LinkTypesCore::postvisit( ast::UnionInstType const * type ) {
         ast::UnionDecl const * decl = symtab.lookupUnion( type->name );
+        ast::UnionInstType * mut = ast::mutate( type );
         // It's not a semantic error if the union is not found, just an implicit forward declaration.
         if ( decl ) {
                 // Just linking in the node.
-                auto mut = ast::mutate( type );
                 mut->base = decl;
-                type = mut;
         }
         if ( !decl || !decl->body ) {
-                auto mut = ast::mutate( type );
                 forwardUnions[ mut->name ].push_back( mut );
-                type = mut;
-        }
-        return type;
+        }
+        return mut;
 }