Changes in src/SymTab/Autogen.cc [ce8c12f:fa4805f]

File:

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

src/SymTab/Autogen.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Mar 03 15:45:56 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:41:08 2017
-// Update Count     : 60
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 28 15:30:00 2017
+// Update Count     : 61
 //
 
@@ -176 +176 @@
                         FunctionType * ftype = funcDecl->get_functionType();
                         assert( ! ftype->get_parameters().empty() );
-                        Type * t = InitTweak::getPointerBase( ftype->get_parameters().front()->get_type() );
-                        assert( t );
+                        Type * t = safe_dynamic_cast< PointerType * >( ftype->get_parameters().front()->get_type() )->get_base();
                         map.insert( Mangler::mangleType( t ), true );
                 }
@@ -263 +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);
@@ -401 +400 @@
         /// generates struct constructors, destructor, and assignment functions
         void makeStructFunctions( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd, const std::vector< FuncData > & data ) {
+                // Builtins do not use autogeneration.
+                if ( aggregateDecl->get_linkage() == LinkageSpec::Builtin ||
+                         aggregateDecl->get_linkage() == LinkageSpec::BuiltinC ) {
+                        return;
+                }
+
                 // Make function polymorphic in same parameters as generic struct, if applicable
                 const std::list< TypeDecl* > & typeParams = aggregateDecl->get_parameters(); // List of type variables to be placed on the generated functions
@@ -487 +492 @@
 
         /// 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 );
@@ -507 +512 @@
                 // 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 *);
@@ -534 +538 @@
                 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.
@@ -552 +556 @@
                                 FunctionDecl * ctor = genFunc( "?{}", memCtorType, functionNesting );
 
-                                makeUnionAssignBody( ctor, isDynamicLayout );
+                                makeUnionAssignBody( ctor );
                                 memCtors.push_back( ctor );
                                 // only generate a ctor for the first field
@@ -579 +583 @@
                         EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() );
                         // enumInst->set_baseEnum( enumDecl );
-                        makeEnumFunctions( enumDecl, enumInst, functionNesting, declsToAddAfter );
+                        makeEnumFunctions( enumInst, functionNesting, declsToAddAfter );
                 }
         }