Changeset 98d4df9 for src/ResolvExpr/ResolveAssertions.cc

Timestamp:

Apr 30, 2019, 2:51:25 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1690778, 1b3eef8, ec28948

Parents:

c64e979 (diff), 686f731 (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/ResolvExpr/ResolveAssertions.cc (modified) (1 diff)

src/ResolvExpr/ResolveAssertions.cc

@@ -155 +155 @@
                                         k += computeConversionCost( 
                                                 assn.match.adjType, assn.decl->get_type(), indexer, x.env );
+                                        
+                                        // mark vars+specialization cost on function-type assertions
+                                        PointerType* ptr = dynamic_cast< PointerType* >( assn.decl->get_type() );
+                                        if ( ! ptr ) continue;
+                                        FunctionType* func = dynamic_cast< FunctionType* >( ptr->base );
+                                        if ( ! func ) continue;
+                                        
+                                        for ( DeclarationWithType* formal : func->parameters ) {
+                                                k.decSpec( specCost( formal->get_type() ) );
+                                        }
+                                        k.incVar( func->forall.size() );
+                                        for ( TypeDecl* td : func->forall ) {
+                                                k.decSpec( td->assertions.size() );
+                                        }
                                 }
                                 it = cache.emplace_hint( it, &x, k );