Changeset 10295d8

Timestamp:

Oct 10, 2017, 2:50:19 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:

228099e

Parents:

adb4a3a

Message:

Stop returning constructor/destructor expressions in prelude generation

File:

• src/MakeLibCfa.cc (modified) (3 diffs)

src/MakeLibCfa.cc

@@ -119 +119 @@
                         newDecls.push_back( funcDecl );
 
+                        Statement * stmt = nullptr;
                         switch ( opInfo.type ) {
                           case CodeGen::OT_INDEX:
@@ -128 +129 @@
                           case CodeGen::OT_POSTFIXASSIGN:
                           case CodeGen::OT_INFIXASSIGN:
+                                        // return the recursive call
+                                        stmt = new ReturnStmt( noLabels, newExpr );
+                                        break;
                           case CodeGen::OT_CTOR:
                           case CodeGen::OT_DTOR:
-                                // return the recursive call
-                                        funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( std::list< Label >(), newExpr ) );
+                                        // execute the recursive call
+                                        stmt = new ExprStmt( noLabels, newExpr );
                                         break;
                           case CodeGen::OT_CONSTANT:
@@ -138 +142 @@
                                 assert( false );
                         } // switch
+                        funcDecl->get_statements()->push_back( stmt );
                 }
         } // namespace