Changes in src/SymTab/Autogen.cc [d7dc824:4b0f997]

File:

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

src/SymTab/Autogen.cc

@@ -262 +262 @@
         // E ?=?(E volatile*, int),
         //   ?=?(E _Atomic volatile*, int);
-        void makeEnumFunctions( EnumInstType *refType, unsigned int functionNesting, std::list< Declaration * > &declsToAdd ) {
+        void makeEnumFunctions( EnumDecl *enumDecl, EnumInstType *refType, unsigned int functionNesting, std::list< Declaration * > &declsToAdd ) {
 
                 // T ?=?(E *, E);
@@ -486 +486 @@
 
         /// generates the body of a union assignment/copy constructor/field constructor
-        void makeUnionAssignBody( FunctionDecl * funcDecl ) {
+        void makeUnionAssignBody( FunctionDecl * funcDecl, bool isDynamicLayout ) {
                 FunctionType * ftype = funcDecl->get_functionType();
                 assert( ftype->get_parameters().size() == 2 );
@@ -506 +506 @@
                 // Make function polymorphic in same parameters as generic union, if applicable
                 const std::list< TypeDecl* > & typeParams = aggregateDecl->get_parameters(); // List of type variables to be placed on the generated functions
-                
+                bool isDynamicLayout = hasDynamicLayout( aggregateDecl );  // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for struct)
+
                 // default ctor/dtor need only first parameter
                 // void ?{}(T *); void ^?{}(T *);
@@ -532 +533 @@
                 FunctionDecl *dtorDecl = genFunc( "^?{}", dtorType, functionNesting );
 
-                makeUnionAssignBody( assignDecl );
+                makeUnionAssignBody( assignDecl, isDynamicLayout );
 
                 // body of assignment and copy ctor is the same
-                makeUnionAssignBody( copyCtorDecl );
+                makeUnionAssignBody( copyCtorDecl, isDynamicLayout );
 
                 // create a constructor which takes the first member type as a parameter.
@@ -550 +551 @@
                                 FunctionDecl * ctor = genFunc( "?{}", memCtorType, functionNesting );
 
-                                makeUnionAssignBody( ctor );
+                                makeUnionAssignBody( ctor, isDynamicLayout );
                                 memCtors.push_back( ctor );
                                 // only generate a ctor for the first field
@@ -577 +578 @@
                         EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() );
                         // enumInst->set_baseEnum( enumDecl );
-                        makeEnumFunctions( enumInst, functionNesting, declsToAddAfter );
+                        makeEnumFunctions( enumDecl, enumInst, functionNesting, declsToAddAfter );
                 }
         }