Changes in src/InitTweak/FixInit.cc [092528b:627f585]

File:

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

src/InitTweak/FixInit.cc

@@ -21 +21 @@
 #include <unordered_set>
 #include "InitTweak.h"
-#include "GenInit.h"
 #include "FixInit.h"
 #include "FixGlobalInit.h"
@@ -87 +86 @@
                         /// create and resolve ctor/dtor expression: fname(var, [cpArg])
                         Expression * makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg = NULL );
+                        Expression * makeCtorDtor( const std::string & fname, Expression * thisArg, Expression * cpArg = NULL );
                         /// true if type does not need to be copy constructed to ensure correctness
                         bool skipCopyConstruct( Type * type );
                         void copyConstructArg( Expression *& arg, ImplicitCopyCtorExpr * impCpCtorExpr );
-                        void destructRet( ObjectDecl * ret, ImplicitCopyCtorExpr * impCpCtorExpr );
+                        void destructRet( Expression * ret, ImplicitCopyCtorExpr * impCpCtorExpr );
 
                         TypeSubstitution * env;
@@ -398 +398 @@
                 Expression * ResolveCopyCtors::makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg ) {
                         assert( var );
-                        // arrays are not copy constructed, so this should always be an ExprStmt
-                        ImplicitCtorDtorStmt * stmt = genCtorDtor( fname, var, cpArg );
-                        ExprStmt * exprStmt = safe_dynamic_cast< ExprStmt * >( stmt->get_callStmt() );
-                        Expression * untyped = exprStmt->get_expr();
+                        return makeCtorDtor( fname, new AddressExpr( new VariableExpr( var ) ), cpArg );
+                }
+
+                Expression * ResolveCopyCtors::makeCtorDtor( const std::string & fname, Expression * thisArg, Expression * cpArg ) {
+                        assert( thisArg );
+                        UntypedExpr * untyped = new UntypedExpr( new NameExpr( fname ) );
+                        untyped->get_args().push_back( thisArg );
+                        if (cpArg) untyped->get_args().push_back( cpArg->clone() );
 
                         // resolve copy constructor
@@ -416 +420 @@
                         } // if
 
-                        delete stmt;
+                        delete untyped;
                         return resolved;
                 }
@@ -452 +456 @@
                 }
 
-                void ResolveCopyCtors::destructRet( ObjectDecl * ret, ImplicitCopyCtorExpr * impCpCtorExpr ) {
-                        impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
+                void ResolveCopyCtors::destructRet( Expression * ret, ImplicitCopyCtorExpr * impCpCtorExpr ) {
+                        impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", new AddressExpr( ret ) ) );
                 }
 
@@ -483 +487 @@
                                 if ( ! result->get_isLvalue() ) {
                                         // destructing lvalue returns is bad because it can cause multiple destructor calls to the same object - the returned object is not a temporary
-                                        destructRet( ret, impCpCtorExpr );
+                                        destructRet( new VariableExpr( ret ), impCpCtorExpr );
                                 }
                         } // for
@@ -511 +515 @@
                                 last->set_expr( makeCtorDtor( "?{}", ret, last->get_expr() ) );
 
-                                stmtExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
+                                stmtExpr->get_dtors().push_front( makeCtorDtor( "^?{}", new AddressExpr( new VariableExpr( ret ) ) ) );
                         } // if