Changeset 9191a8e

Timestamp:

Jul 21, 2017, 4:02:37 PM (7 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:

6d267ca

Parents:

bff227f

Message:

Remove reference to rvalue cast on intrinsic results

File:

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

src/GenPoly/Lvalue.cc

@@ -241 +241 @@
                         } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( castExpr->get_arg()->get_result() ) ) {
                                 // conversion from reference to rvalue
-                                // should be easy, just need to move deref code up here?
                                 PRINT( std::cerr << "convert reference to rvalue -- *" << std::endl; )
-                                if ( isIntrinsicReference( castExpr->get_arg() ) ) {
-                                        PRINT( std::cerr << "but arg is intrinsic reference -- nop" << std::endl; )
-                                        return castExpr;
-                                }
                                 PRINT( std::cerr << "was = " << castExpr << std::endl; )
-
-                                Expression * deref = mkDeref( castExpr->get_arg() );
-                                deref->set_env( castExpr->get_env() );
+                                Expression * ret = castExpr->get_arg();
+                                if ( ! isIntrinsicReference( ret ) ) {
+                                        // dereference if not already dereferenced
+                                        ret = mkDeref( ret );
+                                }
+                                ret->set_env( castExpr->get_env() );
                                 castExpr->set_arg( nullptr );
                                 castExpr->set_env( nullptr );
                                 delete castExpr;
-                                PRINT( std::cerr << "now: " << deref << std::endl; )
-                                return deref;
+                                PRINT( std::cerr << "now: " << ret << std::endl; )
+                                return ret;
                         }
                         return castExpr;