Changeset 436c0de for src/SymTab/Autogen.cc

Timestamp:

Jun 18, 2017, 9:22:22 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/InitTweak/GenInit.cc

File:

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

src/SymTab/Autogen.cc

@@ -262 +262 @@
         // E ?=?(E volatile*, int),
         //   ?=?(E _Atomic volatile*, int);
-        void makeEnumFunctions( EnumDecl *enumDecl, EnumInstType *refType, unsigned int functionNesting, std::list< Declaration * > &declsToAdd ) {
+        void makeEnumFunctions( 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, bool isDynamicLayout ) {
+        void makeUnionAssignBody( FunctionDecl * funcDecl ) {
                 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 *);
@@ -533 +532 @@
                 FunctionDecl *dtorDecl = genFunc( "^?{}", dtorType, functionNesting );
 
-                makeUnionAssignBody( assignDecl, isDynamicLayout );
+                makeUnionAssignBody( assignDecl );
 
                 // body of assignment and copy ctor is the same
-                makeUnionAssignBody( copyCtorDecl, isDynamicLayout );
+                makeUnionAssignBody( copyCtorDecl );
 
                 // create a constructor which takes the first member type as a parameter.
@@ -551 +550 @@
                                 FunctionDecl * ctor = genFunc( "?{}", memCtorType, functionNesting );
 
-                                makeUnionAssignBody( ctor, isDynamicLayout );
+                                makeUnionAssignBody( ctor );
                                 memCtors.push_back( ctor );
                                 // only generate a ctor for the first field
@@ -578 +577 @@
                         EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() );
                         // enumInst->set_baseEnum( enumDecl );
-                        makeEnumFunctions( enumDecl, enumInst, functionNesting, declsToAddAfter );
+                        makeEnumFunctions( enumInst, functionNesting, declsToAddAfter );
                 }
         }