Changeset da6d4566 for src/InitTweak/FixInit.cc

Timestamp:

Mar 21, 2017, 3:11:35 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

a53e10a

Parents:

9c31349 (diff), 168c007 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/InitTweak/FixInit.cc

@@ -534 +534 @@
                         } else {
                                 // expr isn't a call expr, so create a new temporary variable to use to hold the value of the unique expression
-                                unqExpr->set_object( new ObjectDecl( toString("_unq_expr_", unqExpr->get_id()), Type::StorageClasses(), LinkageSpec::C, nullptr, unqExpr->get_result()->clone(), nullptr ) );
+                                unqExpr->set_object( new ObjectDecl( toString("_unq", unqExpr->get_id()), Type::StorageClasses(), LinkageSpec::C, nullptr, unqExpr->get_result()->clone(), nullptr ) );
                                 unqExpr->set_var( new VariableExpr( unqExpr->get_object() ) );
                         }
@@ -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 );