Changeset c3a2007 for src/ResolvExpr

Timestamp:

Oct 28, 2019, 4:28:37 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8364209

Parents:

c921712 (diff), 9bdb8b7 (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

Location:

src/ResolvExpr

Files:

• ConversionCost.cc (modified) (1 diff)
• ResolveAssertions.cc (modified) (1 diff)

src/ResolvExpr/ConversionCost.cc

@@ -157 +157 @@
                         if ( typesCompatibleIgnoreQualifiers( src, destAsRef->base, indexer, env ) ) {
                                 PRINT( std::cerr << "converting compatible base type" << std::endl; )
-                                assert( src->get_lvalue() == srcIsLvalue );
                                 if ( srcIsLvalue ) {
                                         PRINT(

src/ResolvExpr/ResolveAssertions.cc

@@ -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(), false, indexer, x.env );