Changeset e41306d

Timestamp:

Oct 19, 2017, 11:33:25 AM (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:

a15b72c

Parents:

f30b2610

git-author:

Rob Schluntz <rschlunt@…> (10/19/17 11:33:18)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:33:25)

Message:

Transfer env from constructor to SingleInit? when simplifying intrinsic copy constructor [fixes #52]

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -738 +738 @@
                                                 if ( ctorStmt && (ctorCall = isIntrinsicCallExpr( ctorStmt->expr )) && ctorCall->get_args().size() == 2 ) {
                                                         // clean up intrinsic copy constructor calls by making them into SingleInits
-                                                        objDecl->init = new SingleInit( ctorCall->args.back() );
+                                                        Expression * ctorArg = ctorCall->args.back();
+                                                        std::swap( ctorArg->env, ctorCall->env );
+                                                        objDecl->init = new SingleInit( ctorArg );
+
                                                         ctorCall->args.pop_back();
                                                 } else {