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

File:

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

src/SymTab/Autogen.cc

@@ -24 +24 @@
 #include <vector>                  // for vector
 
-#include "AST/Decl.hpp"
 #include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
 #include "Common/PassVisitor.h"    // for PassVisitor
@@ -42 +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 *, bool );
+                typedef FunctionType * (*TypeGen)( Type * );
                 FuncData( const std::string & fname, const TypeGen & genType ) : fname( fname ), genType( genType ) {}
                 std::string fname;
@@ -210 +211 @@
         }
 
-        bool isUnnamedBitfield( const ast::ObjectDecl * obj ) {
-                return obj && obj->name.empty() && obj->bitfieldWidth;
-        }
-
         /// inserts a forward declaration for functionDecl into declsToAdd
         void addForwardDecl( FunctionDecl * functionDecl, std::list< Declaration * > & declsToAdd ) {
@@ -234 +231 @@
 
         /// given type T, generate type of default ctor/dtor, i.e. function type void (*) (T *)
-        FunctionType * genDefaultType( Type * paramType, bool maybePolymorphic ) {
+        FunctionType * genDefaultType( Type * paramType ) {
+                const auto & typeParams = getGenericParams( paramType );
                 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false );
-                if ( maybePolymorphic ) {
-                        // only copy in
-                        const auto & typeParams = getGenericParams( paramType );
-                        cloneAll( typeParams, ftype->forall );
-                }
+                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 );
@@ -247 +241 @@
 
         /// given type T, generate type of copy ctor, i.e. function type void (*) (T *, T)
-        FunctionType * genCopyType( Type * paramType, bool maybePolymorphic ) {
-                FunctionType *ftype = genDefaultType( paramType, maybePolymorphic );
+        FunctionType * genCopyType( Type * paramType ) {
+                FunctionType *ftype = genDefaultType( paramType );
                 ObjectDecl *srcParam = new ObjectDecl( "_src", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
                 ftype->parameters.push_back( srcParam );
@@ -255 +249 @@
 
         /// given type T, generate type of assignment, i.e. function type T (*) (T *, T)
-        FunctionType * genAssignType( Type * paramType, bool maybePolymorphic ) {
-                FunctionType *ftype = genCopyType( paramType, maybePolymorphic );
+        FunctionType * genAssignType( Type * paramType ) {
+                FunctionType *ftype = genCopyType( paramType );
                 ObjectDecl *returnVal = new ObjectDecl( "_ret", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
                 ftype->returnVals.push_back( returnVal );
@@ -314 +308 @@
                 for ( const FuncData & d : data ) {
                         // generate a function (?{}, ?=?, ^?{}) based on the current FuncData.
-                        FunctionType * ftype = d.genType( type, true );
+                        FunctionType * ftype = d.genType( type );
 
                         // destructor for concurrent type must be mutex
@@ -393 +387 @@
 
         void StructFuncGenerator::makeMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool forward ) {
-                InitTweak::InitExpander_old srcParam( src );
+                InitTweak::InitExpander srcParam( src );
 
                 // assign to destination