Changeset 4a60488 for src/ResolvExpr/ResolveAssertions.cc

Timestamp:

Sep 27, 2019, 3:35:46 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

90ce35aa

Parents:

8e1467d (diff), 849720f (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:

Merged from master taking the lvalue changes to expression and everything before that.

File:

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

src/ResolvExpr/ResolveAssertions.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Oct 05 13:46:00 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 10 16:10:37 2019
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:47:00 2019
+// Update Count     : 3
 //
 
@@ -156 +156 @@
                         for ( const auto& assn : x.assns ) {
                                 // compute conversion cost from satisfying decl to assertion
+                                assert( !assn.match.adjType->get_lvalue() );
                                 k += computeConversionCost(
-                                        assn.match.adjType, assn.decl->get_type(), indexer, x.env );
+                                        assn.match.adjType, assn.decl->get_type(), false, indexer, x.env );
 
                                 // mark vars+specialization cost on function-type assertions