Changeset e01559c for src/GenPoly

Timestamp:

Jul 30, 2015, 4:06:11 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, string, with_gc

Children:

e497c1d

Parents:

e766208

Message:

fix initialization of polymorphic value objects so that initializer is done only once

File:

• src/GenPoly/Box.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:19:07 2015
-// Update Count     : 10
+// Last Modified On : Thu Jul 30 14:35:40 2015
+// Update Count     : 54
 //
 
@@ -1051 +1051 @@
                         if ( ObjectDecl *objectDecl = dynamic_cast< ObjectDecl *>( declStmt->get_decl() ) ) {
                                 if ( isPolyVal( objectDecl->get_type(), scopeTyVars ) ) {
+                                        // change initialization of a polymorphic value object
+                                        // to allocate storage with alloca
                                         TypeInstType *typeInst = dynamic_cast< TypeInstType *>( objectDecl->get_type() );
                                         assert( typeInst );
                                         UntypedExpr *alloc = new UntypedExpr( new NameExpr( "__builtin_alloca" ) );
                                         alloc->get_args().push_back( new NameExpr( typeInst->get_name() ) );
-                                        UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );
-                                        assign->get_args().push_back( new VariableExpr( objectDecl ) );
-                                        assign->get_args().push_back( alloc );
-                                        stmtsToAddAfter.push_back( new ExprStmt( noLabels, assign ) );
+
+                                        delete objectDecl->get_init();
+
+                                        std::list<Expression*> designators;
+                                        objectDecl->set_init( new SingleInit( alloc, designators ) );
                                 }
                         }