Changeset 1b31345 for src/InitTweak

Timestamp:

Apr 26, 2016, 3:01:39 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:

c2ce2350

Parents:

668edd6b

Message:

attempt to ensure correct type substitution is passed along to ImplicitCopyCtorExpr?'s callExpr

File:

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

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 11:35:31 2016
+// Last Modified On : Tue Apr 26 14:57:13 2016
 // Update Count     : 30
 //
@@ -228 +228 @@
                 // xxx - handle multiple return values
                 ApplicationExpr * callExpr = impCpCtorExpr->get_callExpr();
+                // xxx - is this right? callExpr may not have the right environment, because it was attached
+                // at a higher level. Trying to pass that environment along.
+                callExpr->set_env( impCpCtorExpr->get_env()->clone() );
                 for ( Type * result : appExpr->get_results() ) {
                         ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result->clone(), new SingleInit( callExpr ) );