Changeset 8d70648 for src/GenPoly/Box.cc

Timestamp:

May 30, 2019, 4:15:08 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

a935892, f474e91

Parents:

d76c588 (diff), d88f8b3b (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

File:

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

src/GenPoly/Box.cc

@@ -657 +657 @@
                                 paramExpr = new AddressExpr( paramExpr );
                         } // if
-                        arg = appExpr->get_args().insert( arg, paramExpr ); // add argument to function call
+                        arg = appExpr->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->set_env( appExpr->get_env() );
-                        appExpr->set_env( 0 );
+                        commaExpr->env = appExpr->env;
+                        appExpr->env = nullptr;
                         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->get_returnVals().front()->get_type(), arg );
+                                ret = addRetParam( appExpr, function->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->get_function(), adapteeType ) );
+                        appExpr->get_args().push_front( new CastExpr( appExpr->function, adapteeType ) );
                         appExpr->set_function( new NameExpr( adapterName ) ); // xxx - result is never set on NameExpr