Changeset bc1ab61 for src/GenPoly

Timestamp:

Apr 6, 2016, 5:13:09 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

78885b5

Parents:

b3ab8f0

Message:

Clean up previous fix to comma expression boxing

File:

• src/GenPoly/Box.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -906 +906 @@
                                         // VariableExpr and MemberExpr are lvalues; need to check this isn't coming from the second arg of a comma expression though (not an lvalue)
                                         if ( CommaExpr *commaArg = dynamic_cast< CommaExpr* >( arg ) ) {
-                                                // hoist first half of expression and return second
-                                                stmtsToAdd.push_back( new ExprStmt( noLabels, commaArg->get_arg1() ) );
-                                                arg = new AddressExpr( commaArg->get_arg2() );
-                                                
-                                                commaArg->set_arg1( 0 );
-                                                commaArg->set_arg2( 0 );
-                                                delete commaArg;
+                                                commaArg->set_arg2( new AddressExpr( commaArg->get_arg2() ) );
                                         } else {
                                                 arg = new AddressExpr( arg );