Changes in src/GenPoly/Lvalue.cc [cf16f94:f8b961b]

File:

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

src/GenPoly/Lvalue.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 15 15:33:13 2015
-// Update Count     : 3
+// Last Modified On : Tue May 19 07:41:33 2015
+// Update Count     : 1
 //
 
@@ -35 +35 @@
                 const std::list<Label> noLabels;
 
+                /// Replace uses of lvalue returns with appropriate pointers
                 class Pass1 : public Mutator {
                   public:
@@ -46 +47 @@
                 };
 
+                /// Replace declarations of lvalue returns with appropriate pointers
                 class Pass2 : public Visitor {
                   public:
@@ -120 +122 @@
                         if ( retval && retStmt->get_expr() ) {
                                 assert( ! retStmt->get_expr()->get_results().empty() );
+                                while ( CastExpr *castExpr = dynamic_cast< CastExpr* >( retStmt->get_expr() ) ) {
+                                        retStmt->set_expr( castExpr->get_arg() );
+                                        retStmt->get_expr()->set_env( castExpr->get_env() );
+                                        castExpr->set_env( 0 );
+                                        castExpr->set_arg( 0 );
+                                        delete castExpr;
+                                } // while
                                 if ( retStmt->get_expr()->get_results().front()->get_isLvalue() ) {
-                                        // ***** Code Removal ***** because casts may be stripped already
-
-                                        // strip casts because not allowed to take address of cast
-                                        // while ( CastExpr *castExpr = dynamic_cast< CastExpr* >( retStmt->get_expr() ) ) {
-                                        //      retStmt->set_expr( castExpr->get_arg() );
-                                        //      retStmt->get_expr()->set_env( castExpr->get_env() );
-                                        //      castExpr->set_env( 0 );
-                                        //      castExpr->set_arg( 0 );
-                                        //      delete castExpr;
-                                        // } // while
                                         retStmt->set_expr( new AddressExpr( retStmt->get_expr()->acceptMutator( *this ) ) );
                                 } else {