Changeset 53449a4 for src/ResolvExpr/CastCost.cc

Timestamp:

Dec 16, 2020, 4:01:57 PM (3 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

8ba363e, c8025a21

Parents:

b3c8496 (diff), 3e5dd913 (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/CastCost.cc (modified) (2 diffs)

src/ResolvExpr/CastCost.cc

@@ -165 +165 @@
                                 } else {
                                         ast::TypeEnvironment newEnv{ env };
-                                        if ( auto wParams = pointerType->base.as< ast::ParameterizedType >() ) {
+                                        if ( auto wParams = pointerType->base.as< ast::FunctionType >() ) {
                                                 newEnv.add( wParams->forall );
                                         }
@@ -202 +202 @@
 ) {
         if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
-                if ( const ast::EqvClass * eqvClass = env.lookup( typeInst->name ) ) {
+                if ( const ast::EqvClass * eqvClass = env.lookup( *typeInst ) ) {
                         // check cast cost against bound type, if present
                         if ( eqvClass->bound ) {