Changes in src/SymTab/Autogen.cc [6926a6d:2bfc6b2]

File:

• src/SymTab/Autogen.cc (modified) (5 diffs)

src/SymTab/Autogen.cc

@@ -41 +41 @@
 
 namespace SymTab {
-        Type * SizeType = 0;
-
         /// Data used to generate functions generically. Specifically, the name of the generated function and a function which generates the routine protoype
         struct FuncData {
-                typedef FunctionType * (*TypeGen)( Type * );
+                typedef FunctionType * (*TypeGen)( Type *, bool );
                 FuncData( const std::string & fname, const TypeGen & genType ) : fname( fname ), genType( genType ) {}
                 std::string fname;
@@ -231 +229 @@
 
         /// given type T, generate type of default ctor/dtor, i.e. function type void (*) (T *)
-        FunctionType * genDefaultType( Type * paramType ) {
-                const auto & typeParams = getGenericParams( paramType );
+        FunctionType * genDefaultType( Type * paramType, bool maybePolymorphic ) {
                 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false );
-                cloneAll( typeParams, ftype->forall );
+                if ( maybePolymorphic ) {
+                        // only copy in
+                        const auto & typeParams = getGenericParams( paramType );
+                        cloneAll( typeParams, ftype->forall );
+                }
                 ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new ReferenceType( Type::Qualifiers(), paramType->clone() ), nullptr );
                 ftype->parameters.push_back( dstParam );
@@ -241 +242 @@
 
         /// given type T, generate type of copy ctor, i.e. function type void (*) (T *, T)
-        FunctionType * genCopyType( Type * paramType ) {
-                FunctionType *ftype = genDefaultType( paramType );
+        FunctionType * genCopyType( Type * paramType, bool maybePolymorphic ) {
+                FunctionType *ftype = genDefaultType( paramType, maybePolymorphic );
                 ObjectDecl *srcParam = new ObjectDecl( "_src", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
                 ftype->parameters.push_back( srcParam );
@@ -249 +250 @@
 
         /// given type T, generate type of assignment, i.e. function type T (*) (T *, T)
-        FunctionType * genAssignType( Type * paramType ) {
-                FunctionType *ftype = genCopyType( paramType );
+        FunctionType * genAssignType( Type * paramType, bool maybePolymorphic ) {
+                FunctionType *ftype = genCopyType( paramType, maybePolymorphic );
                 ObjectDecl *returnVal = new ObjectDecl( "_ret", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
                 ftype->returnVals.push_back( returnVal );
@@ -308 +309 @@
                 for ( const FuncData & d : data ) {
                         // generate a function (?{}, ?=?, ^?{}) based on the current FuncData.
-                        FunctionType * ftype = d.genType( type );
+                        FunctionType * ftype = d.genType( type, true );
 
                         // destructor for concurrent type must be mutex