Changeset 7eabc25 for src/InitTweak

Timestamp:

Apr 11, 2016, 6:01:27 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

db4ecc5

Parents:

7a69460

Message:

use VariableExpr? instead of NameExpr? when creating implicit ctor/dtor calls

File:

• src/InitTweak/RemoveInit.cc (modified) (4 diffs)

src/InitTweak/RemoveInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 04 17:18:03 2016
+// Last Modified On : Mon Apr 11 17:28:43 2016
 // Update Count     : 166
 //
@@ -95 +95 @@
                                 // xxx this can be more complicated - consider ListInit
                                 UntypedExpr *assign = new UntypedExpr( new NameExpr( "?{}" ) );
-                                assign->get_args().push_back( new AddressExpr (new NameExpr( objDecl->get_name() ) ) );
+                                assign->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
                                 assign->get_args().push_back( single->get_value()->clone() );
                                 stmtsToAddAfter.push_back(new ExprStmt(noLabels, assign));
@@ -108 +108 @@
                 // hands off if the function returns an lvalue - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_isLvalue()  ) {
+                if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_isLvalue() ) {
                         // ensure return value is not destructed by explicitly creating
                         // an empty SingleInit node wherein maybeConstruct is false
@@ -116 +116 @@
                         // and explicitly create the constructor expression separately
                         UntypedExpr *construct = new UntypedExpr( new NameExpr( "?{}" ) );
-                        construct->get_args().push_back( new AddressExpr (new NameExpr( newObj->get_name() ) ) );
+                        construct->get_args().push_back( new AddressExpr( new VariableExpr( newObj ) ) );
                         construct->get_args().push_back( returnStmt->get_expr() );
                         stmtsToAdd.push_back(new ExprStmt(noLabels, construct));