Changes in src/GenPoly/Box.cc [2d80111:02fdb8e]

File:

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

src/GenPoly/Box.cc

@@ -657 +657 @@
                                 paramExpr = new AddressExpr( paramExpr );
                         } // if
-                        arg = appExpr->args.insert( arg, paramExpr ); // add argument to function call
+                        arg = appExpr->get_args().insert( arg, paramExpr ); // add argument to function call
                         arg++;
                         // Build a comma expression to call the function and emulate a normal return.
                         CommaExpr *commaExpr = new CommaExpr( appExpr, retExpr );
-                        commaExpr->env = appExpr->env;
-                        appExpr->env = nullptr;
+                        commaExpr->set_env( appExpr->get_env() );
+                        appExpr->set_env( 0 );
                         return commaExpr;
                 }
@@ -708 +708 @@
 //                      if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
                         if ( isDynRet( function, tyVars ) ) {
-                                ret = addRetParam( appExpr, function->returnVals.front()->get_type(), arg );
+                                ret = addRetParam( appExpr, function->get_returnVals().front()->get_type(), arg );
                         } // if
                         std::string mangleName = mangleAdapterName( function, tyVars );
@@ -715 +715 @@
                         // cast adaptee to void (*)(), since it may have any type inside a polymorphic function
                         Type * adapteeType = new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
-                        appExpr->get_args().push_front( new CastExpr( appExpr->function, adapteeType ) );
+                        appExpr->get_args().push_front( new CastExpr( appExpr->get_function(), adapteeType ) );
                         appExpr->set_function( new NameExpr( adapterName ) ); // xxx - result is never set on NameExpr
 
@@ -725 +725 @@
                         if ( ! needsBoxing( param, arg->result, exprTyVars, env ) ) return;
 
-                        if ( arg->get_lvalue() ) {
+                        if ( arg->result->get_lvalue() ) {
                                 // argument expression may be CFA lvalue, but not C lvalue -- apply generalizedLvalue transformations.
                                 // if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( arg ) ) {