Changes in src/GenPoly/Box.cc [0a81c3f:2a7b3ca]

File:

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

src/GenPoly/Box.cc

@@ -758 +758 @@
                                         // if the argument's type is polymorphic, we don't need to box again!
                                         return;
-                                } else if ( arg->get_result()->get_lvalue() ) {  // xxx - is this still right??
-                                // xxx - dynamic_cast<ReferenceType *>( arg->get_result() )??
+                                } else if ( arg->get_result()->get_lvalue() ) {
                                         // VariableExpr and MemberExpr are lvalues; need to check this isn't coming from the second arg of a comma expression though (not an lvalue)
                                         // xxx - need to test that this code is still reachable
@@ -1037 +1036 @@
                                                 assert( appExpr->has_result() );
                                                 assert( ! appExpr->get_args().empty() );
-                                                if ( isPolyPtr( appExpr->get_result(), scopeTyVars, env ) ) { // dereference returns a reference type
-                                                        // remove dereference from polymorphic types since they are boxed.
+                                                if ( isPolyType( appExpr->get_result(), scopeTyVars, env ) ) {
                                                         Expression *ret = appExpr->get_args().front();
                                                         delete ret->get_result();