Changeset 978e5eb

Timestamp:

Jan 18, 2021, 2:11:11 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3d3d75e

Parents:

4fc3343

Message:

Calculation of specialization benefit (spec "cost") looks inside the body of xInstTypes, counting one benefit for each inner type constructor met. Fixes 225?

Files:

• src/ResolvExpr/SpecCost.cc (modified) (6 diffs)
• tests/.expect/poly-selection.txt (added)
• tests/poly-selection.cfa (added)

src/ResolvExpr/SpecCost.cc

@@ -43 +43 @@
                 // mark specialization of base type
                 void postvisit(ReferenceType*) { if ( count >= 0 ) ++count; }
+
+                void postvisit(StructInstType*) { if ( count >= 0 ) ++count; }
+                void postvisit(UnionInstType*) { if ( count >= 0 ) ++count; }
 
         private:
@@ -82 +85 @@
                 void previsit(StructInstType* sty) {
                         count = minover( sty->parameters );
-                        visit_children = false;
                 }
 
@@ -88 +90 @@
                 void previsit(UnionInstType* uty) {
                         count = minover( uty->parameters );
-                        visit_children = false;
                 }
 
@@ -174 +175 @@
                 void postvisit( const ast::ArrayType * ) { if ( count >= 0 ) ++count; }
                 void postvisit( const ast::ReferenceType * ) { if ( count >= 0 ) ++count; }
+
+                void postvisit( const ast::StructInstType * ) { if ( count >= 0 ) ++count; }
+                void postvisit( const ast::UnionInstType * ) { if ( count >= 0 ) ++count; }
 
                 // Use the minimal specialization value over returns and params.
@@ -189 +193 @@
                 void previsit( const ast::StructInstType * sty ) {
                         count = minimumPresent( sty->params, expr_result );
-                        visit_children = false;
                 }
 
@@ -195 +198 @@
                 void previsit( const ast::UnionInstType * uty ) {
                         count = minimumPresent( uty->params, expr_result );
-                        visit_children = false;
                 }