Changeset f8d05ee for src/ResolvExpr/ConversionCost.cc

Timestamp:

Aug 12, 2020, 12:19:39 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

74807be, fb0ae06

Parents:

7f66cec (diff), 7ff3e522 (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 'new-ast' of plg.uwaterloo.ca:software/cfa/cfa-cc into new-ast

File:

• src/ResolvExpr/ConversionCost.cc (modified) (2 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -522 +522 @@
                 ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
                 src->accept( converter );
-                return converter.pass.cost;
+                return converter.core.cost;
         }
 }
@@ -565 +565 @@
                         ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
                         src->accept( converter );
-                        return converter.pass.cost;
+                        return converter.core.cost;
                 }
         } else {