Changeset b617e4b for src/InitTweak

Timestamp:

Apr 14, 2016, 5:33:37 PM (8 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:

dc2e7e0

Parents:

356189a

Message:

ensure temporaries created for copy construction are not const

File:

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

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:19:11 2016
+// Last Modified On : Thu Apr 14 17:29:21 2016
 // Update Count     : 30
 //
@@ -152 +152 @@
 
                 // resolve function call
-                Expression * newExpr = ResolvExpr::findVoidExpression( impCpCtorExpr->get_callExpr(), *this );
+                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( impCpCtorExpr->get_callExpr(), *this ) );
+                assert( appExpr );
                 delete impCpCtorExpr->get_callExpr();
-                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( newExpr );
-                assert( appExpr );
                 impCpCtorExpr->set_callExpr( appExpr );
+
+                // Visitor::visit( impCpCtorExpr );
 
                 // take each argument and attempt to copy construct it.
@@ -163 +164 @@
                         assert( ! arg->get_results().empty() );
                         ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, arg->get_results().front()->clone(), 0 );
+                        tmp->get_type()->set_isConst( false );
 
                         // create and resolve copy constructor
@@ -186 +188 @@
                 for ( Type * result : appExpr->get_results() ) {
                         ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result->clone(), new SingleInit( impCpCtorExpr->get_callExpr() ) );
+                        ret->get_type()->set_isConst( false );
                         impCpCtorExpr->get_returnDecls().push_back( ret );
                         impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
@@ -195 +198 @@
                 impCpCtorExpr = dynamic_cast< ImplicitCopyCtorExpr * >( Mutator::mutate( impCpCtorExpr ) );
                 assert( impCpCtorExpr );
-                std::cerr << "Running FixCopyCtors on implicit copy ctor..." << std::endl;
 
                 std::list< Expression * > & copyCtors = impCpCtorExpr->get_copyCtors();