Changeset 5f6c42c for src/GenPoly/Lvalue.cc

Timestamp:

Dec 15, 2015, 5:33:25 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:

35304009, 8360977

Parents:

ffad73a (diff), 4389966 (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 changes from Peter

File:

• src/GenPoly/Lvalue.cc (modified) (2 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 May 19 07:41:33 2015
-// Update Count     : 1
+// Last Modified On : Tue Dec 15 15:33:13 2015
+// Update Count     : 3
 //
 
@@ -122 +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 {