Changes in / [8b11840:b56c17c]

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (2 diffs)
• GenInit.cc (modified) (2 diffs)
• InitTweak.cc (modified) (2 diffs)
• InitTweak.h (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -58 +58 @@
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution, operator<<
 #include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
-#include "Tuples/Tuples.h"             // for isTtype
 
 bool ctordtorp = false; // print all debug
@@ -368 +367 @@
                 }
 
-                bool ResolveCopyCtors::skipCopyConstruct( Type * type ) {
-                        return dynamic_cast< VarArgsType * >( type ) || dynamic_cast< ReferenceType * >( type ) || GenPoly::getFunctionType( type ) || Tuples::isTtype( type );
-                }
+                bool ResolveCopyCtors::skipCopyConstruct( Type * type ) { return ! isConstructable( type ); }
 
                 Expression * ResolveCopyCtors::makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg ) {

src/InitTweak/GenInit.cc

@@ -75 +75 @@
                 // that need to be constructed or destructed
                 void previsit( StructDecl *aggregateDecl );
-                void premutate( AggregateDecl * ) { visit_children = false; }
-                void premutate( NamedTypeDecl * ) { visit_children = false; }
+                void previsit( AggregateDecl * ) { visit_children = false; }
+                void previsit( NamedTypeDecl * ) { visit_children = false; }
                 void previsit( FunctionType * ) { visit_children = false; }
 
@@ -130 +130 @@
                 // hands off if the function returns a reference - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                if ( returnStmt->get_expr() && returnVals.size() == 1 && tryConstruct( returnVals.front() ) ) {
+                if ( returnStmt->get_expr() && returnVals.size() == 1 && isConstructable( returnVals.front()->get_type() ) ) {
                         // explicitly construct the return value using the return expression and the retVal object
                         assertf( returnVals.front()->get_name() != "", "Function %s has unnamed return value\n", funcName.c_str() );

src/InitTweak/InitTweak.cc

@@ -22 +22 @@
 #include "SynTree/Type.h"          // for FunctionType, ArrayType, PointerType
 #include "SynTree/Visitor.h"       // for Visitor, maybeAccept
+#include "Tuples/Tuples.h"         // for Tuples::isTtype
 
 class UntypedValofExpr;
@@ -276 +277 @@
                                 ( objDecl->get_init() != nullptr && objDecl->get_init()->get_maybeConstructed() ))
                         && ! objDecl->get_storageClasses().is_extern
-                        && ! dynamic_cast< ReferenceType * >( objDecl->type );
+                        && isConstructable( objDecl->type );
+        }
+
+        bool isConstructable( Type * type ) {
+                return ! dynamic_cast< VarArgsType * >( type ) && ! dynamic_cast< ReferenceType * >( type ) && ! dynamic_cast< FunctionType * >( type ) && ! Tuples::isTtype( type );
         }
 

src/InitTweak/InitTweak.h

@@ -35 +35 @@
         /// True if the resolver should try to construct dwt
         bool tryConstruct( DeclarationWithType * dwt );
+
+        /// True if the type can have a user-defined constructor
+        bool isConstructable( Type * t );
 
         /// True if the Initializer contains designations