Changeset 9058414 for src

Timestamp:

Dec 18, 2017, 2:11:13 PM (6 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:

7641b6c

Parents:

74cdfb1

Message:

Generate reference assignment for reference component of a tuple assignment

File:

• src/Tuples/TupleAssignment.cc (modified) (2 diffs)

src/Tuples/TupleAssignment.cc

@@ -272 +272 @@
                 // args.push_back( new AddressExpr( new VariableExpr( left ) ) );
                 if ( right ) args.push_back( new VariableExpr( right ) );
-                return new UntypedExpr( new NameExpr( fname ), args );
+                if ( left->type->referenceDepth() > 1 && CodeGen::isConstructor( fname ) ) {
+                        args.front() = new AddressExpr( args.front() );
+                        if ( right ) args.back() = new AddressExpr( args.back() );
+                        return new UntypedExpr( new NameExpr( "?=?" ), args );
+                } else {
+                        return new UntypedExpr( new NameExpr( fname ), args );
+                }
         }
 
@@ -291 +297 @@
                 if ( ! dynamic_cast< ReferenceType * >( expr->get_result() ) ) {
                         ConstructorInit * ctorInit = InitTweak::genCtorInit( ret );
-                        ret->set_init( ctorInit );
+                        ret->init = ctorInit;
                         ResolvExpr::resolveCtorInit( ctorInit, spotter.currentFinder.get_indexer() ); // resolve ctor/dtors for the new object
                         PassVisitor<EnvRemover> rm; // remove environments from subexpressions of StmtExprs