Changeset 98399b2 for src/GenPoly

Timestamp:

Aug 9, 2019, 11:09:43 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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

Children:

4f5a8a2

Parents:

8c63bb4 (diff), 0f19f5e5 (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/GenPoly

Files:

• Box.cc (modified) (1 diff)
• Lvalue.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -725 +725 @@
                         if ( ! needsBoxing( param, arg->result, exprTyVars, env ) ) return;
 
-                        if ( arg->result->get_lvalue() ) {
+                        if ( arg->get_lvalue() ) {
                                 // argument expression may be CFA lvalue, but not C lvalue -- apply generalizedLvalue transformations.
                                 // if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( arg ) ) {

src/GenPoly/Lvalue.cc

@@ -363 +363 @@
                         int diff = depth1 - depth2;
 
-                        if ( diff > 0 && ! srcType->get_lvalue() ) {
+                        if ( diff > 0 && ! castExpr->arg->get_lvalue() ) {
                                 // rvalue to reference conversion -- introduce temporary
                                 // know that reference depth of cast argument is 0, need to introduce n temporaries for reference depth of n, e.g.
@@ -407 +407 @@
                                         ret = new AddressExpr( ret );
                                 }
-                                if ( srcType->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
+                                if ( castExpr->arg->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
                                         // must keep cast if cast-to type is different from the actual type
                                         castExpr->arg = ret;