Changeset d335627 for src/GenPoly/Box.cc

Timestamp:

Jul 25, 2017, 10:48:07 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8a6cf7e

Parents:

6d267ca

Message:

Add address-of to intrinsic reference-returning functions that are arguments to non-intrinsic functions

File:

• src/GenPoly/Box.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -1027 +1027 @@
                                                 } // if
                                                 if ( baseType1 || baseType2 ) {
-                                                        ret->set_result( appExpr->get_result()->clone() );
+                                                        Type * baseType = InitTweak::getPointerBase( appExpr->get_result() );
+                                                        assert( baseType );
+                                                        ret->set_result( baseType->clone() );
                                                         if ( appExpr->get_env() ) {
                                                                 ret->set_env( appExpr->get_env() );
@@ -1222 +1224 @@
                         // isPolyType check needs to happen before mutating addrExpr arg, so pull it forward
                         // out of the if condition.
+                        addrExpr->set_arg( mutateExpression( addrExpr->get_arg() ) );
+                        // ... but must happen after mutate, since argument might change (e.g. intrinsic *?, ?[?]) - re-evaluate above comment
                         bool polytype = isPolyType( addrExpr->get_arg()->get_result(), scopeTyVars, env );
-                        addrExpr->set_arg( mutateExpression( addrExpr->get_arg() ) );
                         if ( polytype || needs ) {
                                 Expression *ret = addrExpr->get_arg();