Changeset cf18eea for src/InitTweak

Timestamp:

Apr 25, 2016, 3:53:15 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5382492

Parents:

add371c

Message:

don't copy construct function type arguments or va_list type arguments

File:

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

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 25 14:44:21 2016
+// Last Modified On : Mon Apr 25 15:16:12 2016
 // Update Count     : 30
 //
@@ -27 +27 @@
 #include "SymTab/Indexer.h"
 #include "GenPoly/PolyMutator.h"
+#include "GenPoly/GenPoly.h"
 
 bool ctordtorp = false;
@@ -58 +59 @@
                 /// create and resolve ctor/dtor expression: fname(var, [cpArg])
                 ApplicationExpr * makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg = NULL );
+                /// true if type does not need to be copy constructed to ensure correctness
+                bool skipCopyConstruct( Type * );
         };
 
@@ -150 +153 @@
         }
 
+        bool ResolveCopyCtors::skipCopyConstruct( Type * type ) {
+                return dynamic_cast< VarArgsType * >( type ) || GenPoly::getFunctionType( type );
+        }
+
         ApplicationExpr * ResolveCopyCtors::makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg ) {
                 assert( var );
@@ -180 +187 @@
                         // xxx - need to handle tuple arguments
                         assert( ! arg->get_results().empty() );
-                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, arg->get_results().front()->clone(), 0 );
+                        Type * result = arg->get_results().front();
+                        if ( skipCopyConstruct( result ) ) continue; // skip certain non-copyable types
+                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result->clone(), 0 );
                         tmp->get_type()->set_isConst( false );