Changes in src/InitTweak/FixInit.cc [ba3706f:5fe35d6]

File:

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

src/InitTweak/FixInit.cc

@@ -49 +49 @@
 #include "SynTree/Expression.h"        // for UniqueExpr, VariableExpr, Unty...
 #include "SynTree/Initializer.h"       // for ConstructorInit, SingleInit
-#include "SynTree/Label.h"             // for Label, operator<
+#include "SynTree/Label.h"             // for Label, noLabels, operator<
 #include "SynTree/Mutator.h"           // for mutateAll, Mutator, maybeMutate
 #include "SynTree/Statement.h"         // for ExprStmt, CompoundStmt, Branch...
@@ -393 +393 @@
                         if ( skipCopyConstruct( result ) ) return; // skip certain non-copyable types
 
-                        // type may involve type variables, so apply type substitution to get temporary variable's actual type,
-                        // since result type may not be substituted (e.g., if the type does not appear in the parameter list)
+                        // type may involve type variables, so apply type substitution to get temporary variable's actual type.
                         // Use applyFree so that types bound in function pointers are not substituted, e.g. in forall(dtype T) void (*)(T).
+                        result = result->clone();
                         env->applyFree( result );
                         ObjectDecl * tmp = ObjectDecl::newObject( "__tmp", result, nullptr );
@@ -544 +544 @@
                         // add all temporary declarations and their constructors
                         for ( ObjectDecl * obj : tempDecls ) {
-                                stmtsToAddBefore.push_back( new DeclStmt( obj ) );
+                                stmtsToAddBefore.push_back( new DeclStmt( noLabels, obj ) );
                         } // for
                         for ( ObjectDecl * obj : returnDecls ) {
-                                stmtsToAddBefore.push_back( new DeclStmt( obj ) );
+                                stmtsToAddBefore.push_back( new DeclStmt( noLabels, obj ) );
                         } // for
 
                         // add destructors after current statement
                         for ( Expression * dtor : dtors ) {
-                                stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
+                                stmtsToAddAfter.push_back( new ExprStmt( noLabels, dtor ) );
                         } // for
 
@@ -570 +570 @@
 
                         if ( returnDecl ) {
-                                ApplicationExpr * assign = createBitwiseAssignment( new VariableExpr( returnDecl ), callExpr );
+                                UntypedExpr * assign = new UntypedExpr( new NameExpr( "?=?" ) );
+                                assign->get_args().push_back( new VariableExpr( returnDecl ) );
+                                assign->get_args().push_back( callExpr );
+                                // know the result type of the assignment is the type of the LHS (minus the pointer), so
+                                // add that onto the assignment expression so that later steps have the necessary information
+                                assign->set_result( returnDecl->get_type()->clone() );
+
                                 Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
                                 // move env from callExpr to retExpr
@@ -598 +604 @@
                         if ( ! result->isVoid() ) {
                                 for ( ObjectDecl * obj : stmtExpr->get_returnDecls() ) {
-                                        stmtsToAddBefore.push_back( new DeclStmt( obj ) );
+                                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, obj ) );
                                 } // for
                                 // add destructors after current statement
                                 for ( Expression * dtor : stmtExpr->get_dtors() ) {
-                                        stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
+                                        stmtsToAddAfter.push_back( new ExprStmt( noLabels, dtor ) );
                                 } // for
                                 // must have a non-empty body, otherwise it wouldn't have a result
                                 assert( ! stmts.empty() );
                                 assert( ! stmtExpr->get_returnDecls().empty() );
-                                stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
+                                stmts.push_back( new ExprStmt( noLabels, new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
                                 stmtExpr->get_returnDecls().clear();
                                 stmtExpr->get_dtors().clear();
@@ -685 +691 @@
 
                                                 // generate body of if
-                                                CompoundStmt * initStmts = new CompoundStmt();
+                                                CompoundStmt * initStmts = new CompoundStmt( noLabels );
                                                 std::list< Statement * > & body = initStmts->get_kids();
                                                 body.push_back( ctor );
-                                                body.push_back( new ExprStmt( setTrue ) );
+                                                body.push_back( new ExprStmt( noLabels, setTrue ) );
 
                                                 // put it all together
-                                                IfStmt * ifStmt = new IfStmt( new VariableExpr( isUninitializedVar ), initStmts, 0 );
-                                                stmtsToAddAfter.push_back( new DeclStmt( isUninitializedVar ) );
+                                                IfStmt * ifStmt = new IfStmt( noLabels, new VariableExpr( isUninitializedVar ), initStmts, 0 );
+                                                stmtsToAddAfter.push_back( new DeclStmt( noLabels, isUninitializedVar ) );
                                                 stmtsToAddAfter.push_back( ifStmt );
 
@@ -707 +713 @@
 
                                                         // void __objName_dtor_atexitN(...) {...}
-                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                                                         dtorCaller->fixUniqueId();
                                                         dtorCaller->get_statements()->push_back( dtorStmt );
@@ -715 +721 @@
                                                         callAtexit->get_args().push_back( new VariableExpr( dtorCaller ) );
 
-                                                        body.push_back( new ExprStmt( callAtexit ) );
+                                                        body.push_back( new ExprStmt( noLabels, callAtexit ) );
 
                                                         // hoist variable and dtor caller decls to list of decls that will be added into global scope
@@ -1140 +1146 @@
                         assert( ctorExpr->result && ctorExpr->get_result()->size() == 1 );
 
+                        // xxx - ideally we would reuse the temporary generated from the copy constructor passes from within firstArg if it exists and not generate a temporary if it's unnecessary.
+                        ObjectDecl * tmp = ObjectDecl::newObject( tempNamer.newName(), ctorExpr->get_result()->clone(), nullptr );
+                        declsToAddBefore.push_back( tmp );
+
                         // xxx - this can be TupleAssignExpr now. Need to properly handle this case.
                         ApplicationExpr * callExpr = strict_dynamic_cast< ApplicationExpr * > ( ctorExpr->get_callExpr() );
@@ -1145 +1155 @@
                         ctorExpr->set_callExpr( nullptr );
                         ctorExpr->set_env( nullptr );
-
-                        // xxx - ideally we would reuse the temporary generated from the copy constructor passes from within firstArg if it exists and not generate a temporary if it's unnecessary.
-                        ObjectDecl * tmp = ObjectDecl::newObject( tempNamer.newName(), callExpr->args.front()->result->clone(), nullptr );
-                        declsToAddBefore.push_back( tmp );
                         delete ctorExpr;