Changeset b8baa37 for src/InitTweak

Timestamp:

Mar 2, 2018, 5:34:52 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:

938dd75

Parents:

09c72d5

git-author:

Rob Schluntz <rschlunt@…> (03/02/18 17:16:34)

git-committer:

Rob Schluntz <rschlunt@…> (03/02/18 17:34:52)

Message:

Clone full environment rather than trim for destructors (temporary fix)

File:

• src/InitTweak/FixInit.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -187 +187 @@
                 };
 
-                class FixCopyCtors final : public WithStmtsToAdd, public WithShortCircuiting, public WithVisitorRef<FixCopyCtors> {
+                class FixCopyCtors final : public WithStmtsToAdd, public WithShortCircuiting, public WithVisitorRef<FixCopyCtors>, public WithTypeSubstitution {
                   public:
                         FixCopyCtors( UnqCount & unqCount ) : unqCount( unqCount ){}
@@ -636 +636 @@
                                 // take relevant bindings from environment
                                 assert( ! dtor->env );
-                                dtor->env =  TypeSubstitution::newFromExpr( dtor, impCpCtorExpr->env );
+                                dtor->env =  maybeClone( env );
                                 stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
                         } // for