Changeset 185cd94

Timestamp:

Mar 27, 2025, 3:48:34 PM (4 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

52931c5

Parents:

b1c220a (diff), 10c1770 (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/GenPoly/InstantiateGeneric.cpp (modified) (4 diffs)
• src/ResolvExpr/Resolver.cpp (modified) (2 diffs)
• tests/.expect/functions.arm64.txt (modified) (4 diffs)
• tests/.expect/functions.x64.txt (modified) (4 diffs)
• tests/.expect/functions.x86.txt (modified) (4 diffs)

src/GenPoly/InstantiateGeneric.cpp ¶

@@ -42 +42 @@
 
 using type_vector = ast::vector< ast::TypeExpr >;
+
+template<typename C, typename V>
+bool contains( C const & container, V const & value ) {
+        return std::any_of( container.begin(), container.end(),
+                        [value]( auto& element ){ return element == value; } );
+}
 
 /// Abstracts type equality for a list of parameter types.
@@ -423 +429 @@
 }
 
-struct GenericInstantiator final :
+class GenericInstantiator final :
                 public ast::WithCodeLocation,
                 public ast::WithConstTypeSubstitution,
@@ -444 +450 @@
         /// member from an instantiation.
         int memberIndex = -1;
+        /// The polymorphic types we are currently instantiating.
+        ast::vector<ast::Decl> instantiating;
+public:
 
         GenericInstantiator() :
@@ -597 +606 @@
                         );
 
-                        // Forward declare before recursion. (TODO: Only when needed, #199.)
+                        // Insert the declaration so it doesn't create it again,
                         insert( inst, typeSubs, newDecl );
-                        if ( AggrDecl const * forwardDecl = ast::asForward( newDecl ) ) {
-                                declsToAddBefore.push_back( forwardDecl );
-                        }
+                        // ... but mark this declaration as one we are working on.
+                        auto guard = makeFuncGuard(
+                                [this, newDecl](){ instantiating.push_back( newDecl ); },
+                                [this](){ instantiating.pop_back(); } );
                         // Recursively instantiate members:
                         concDecl = strict_dynamic_cast<AggrDecl const *>(
                                 newDecl->accept( *visitor ) );
-                        // Must occur before declaration is added so
-                        // that member instantiation appear first.
+
+                        // Produce the declaration after its members are instantiated.
                         declsToAddBefore.push_back( concDecl );
+                } else if ( contains( instantiating, concDecl ) ) {
+                        if ( AggrDecl const * forwardDecl = ast::asForward( concDecl ) ) {
+                                declsToAddBefore.push_back( forwardDecl );
+                        }
                 }
                 return new ast::SueInstType<AggrDecl>( concDecl, inst->qualifiers );

src/ResolvExpr/Resolver.cpp ¶

@@ -703 +703 @@
         } else {
                 if ( !objectDecl->isTypeFixed ) {
-                        auto newDecl = fixObjectType(objectDecl, context);
-                        auto mutDecl = mutate(newDecl);
+                        objectDecl = fixObjectType(objectDecl, context);
 
                         // generate CtorInit wrapper when necessary.
@@ -710 +709 @@
                         // this object in visitor pass, thus disabling CtorInit codegen.
                         // this happens on aggregate members and function parameters.
-                        if ( shouldGenCtorInit( mutDecl ) ) {
+                        if ( shouldGenCtorInit( objectDecl ) ) {
                                 // constructed objects cannot be designated
-                                if ( InitTweak::isDesignated( mutDecl->init ) ) {
-                                        ast::Pass<ResolveDesignators> res( context );
-                                        maybe_accept( mutDecl->init.get(), res );
-                                        if ( !res.core.result ) {
-                                                SemanticError( mutDecl, "Cannot include designations in the initializer for a managed Object.\n"
-                                                                           "If this is really what you want, initialize with @=." );
-                                        }
+                                if ( InitTweak::isDesignated( objectDecl->init )
+                                                && !ast::Pass<ResolveDesignators>::read(
+                                                        objectDecl->init.get(), context ) ) {
+                                        SemanticError( objectDecl, "Cannot include designations in the initializer for a managed Object.\n"
+                                                        "If this is really what you want, initialize with @=." );
                                 }
                                 // constructed objects should not have initializers nested too deeply
-                                if ( ! InitTweak::checkInitDepth( mutDecl ) ) SemanticError( mutDecl, "Managed object's initializer is too deep " );
-
-                                mutDecl->init = InitTweak::genCtorInit( mutDecl->location, mutDecl );
+                                if ( !InitTweak::checkInitDepth( objectDecl ) ) SemanticError( objectDecl, "Managed object's initializer is too deep " );
+
+                                objectDecl = ast::mutate_field( objectDecl, &ast::ObjectDecl::init,
+                                        InitTweak::genCtorInit( objectDecl->location, objectDecl ) );
                         }
-
-                        objectDecl = mutDecl;
                 }
                 currentObject = ast::CurrentObject{ objectDecl->location, objectDecl->get_type() };

tests/.expect/functions.arm64.txt ¶

@@ -139 +139 @@
 
 }
-struct _conc__tuple2_0;
 struct _conc__tuple2_0 {
     signed int field_0;
@@ -182 +181 @@
 
 }
-struct _conc__tuple3_1;
 struct _conc__tuple3_1 {
     signed int field_0;
@@ -202 +200 @@
     __attribute__ ((unused)) struct _conc__tuple3_1 _X9_retval_fT3iii_1 = {  };
 }
-struct _conc__tuple3_2;
 struct _conc__tuple3_2 {
     signed int field_0;
@@ -294 +291 @@
     __attribute__ ((unused)) signed int *const _X10_retval_f3KPi_1;
 }
-struct _conc__tuple2_3;
 struct _conc__tuple2_3 {
     signed int *field_0;

tests/.expect/functions.x64.txt ¶

@@ -139 +139 @@
 
 }
-struct _conc__tuple2_0;
 struct _conc__tuple2_0 {
     signed int field_0;
@@ -182 +181 @@
 
 }
-struct _conc__tuple3_1;
 struct _conc__tuple3_1 {
     signed int field_0;
@@ -202 +200 @@
     __attribute__ ((unused)) struct _conc__tuple3_1 _X9_retval_fT3iii_1 = {  };
 }
-struct _conc__tuple3_2;
 struct _conc__tuple3_2 {
     signed int field_0;
@@ -294 +291 @@
     __attribute__ ((unused)) signed int *const _X10_retval_f3KPi_1;
 }
-struct _conc__tuple2_3;
 struct _conc__tuple2_3 {
     signed int *field_0;

tests/.expect/functions.x86.txt ¶

@@ -139 +139 @@
 
 }
-struct _conc__tuple2_0;
 struct _conc__tuple2_0 {
     signed int field_0;
@@ -182 +181 @@
 
 }
-struct _conc__tuple3_1;
 struct _conc__tuple3_1 {
     signed int field_0;
@@ -202 +200 @@
     __attribute__ ((unused)) struct _conc__tuple3_1 _X9_retval_fT3iii_1 = {  };
 }
-struct _conc__tuple3_2;
 struct _conc__tuple3_2 {
     signed int field_0;
@@ -294 +291 @@
     __attribute__ ((unused)) signed int *const _X10_retval_f3KPi_1;
 }
-struct _conc__tuple2_3;
 struct _conc__tuple2_3 {
     signed int *field_0;