Changeset 6840e7c for src/MakeLibCfa.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

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