Changeset 233e4d9

Timestamp:

Mar 20, 2017, 3:52:47 PM (8 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:

2c4bc81

Parents:

14a33790

Message:

simplify generated code by collapsing intrinsic constructor calls into C-style initializers

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -764 +764 @@
                                                 }
                                         } else {
-                                                stmtsToAddAfter.push_back( ctor );
+                                                ImplicitCtorDtorStmt * implicit = safe_dynamic_cast< ImplicitCtorDtorStmt * > ( ctor );
+                                                ExprStmt * ctorStmt = dynamic_cast< ExprStmt * >( implicit->get_callStmt() );
+                                                ApplicationExpr * ctorCall = nullptr;
+                                                if ( ctorStmt && (ctorCall = isIntrinsicCallExpr( ctorStmt->get_expr() )) && ctorCall->get_args().size() == 2 ) {
+                                                        // clean up intrinsic copy constructor calls by making them into SingleInits
+                                                        objDecl->set_init( new SingleInit( ctorCall->get_args().back() ) );
+                                                        ctorCall->get_args().pop_back();
+                                                } else {
+                                                        stmtsToAddAfter.push_back( ctor );
+                                                        objDecl->set_init( NULL );
+                                                        ctorInit->set_ctor( NULL );
+                                                }
                                         } // if
-                                        objDecl->set_init( NULL );
-                                        ctorInit->set_ctor( NULL );
                                 } else if ( Initializer * init = ctorInit->get_init() ) {
                                         objDecl->set_init( init );