Changeset a12d5aa for src/SymTab

Timestamp:

Jun 29, 2017, 5:13:42 PM (7 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:

435e75f

Parents:

62423350 (diff), 1abc5ab (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' into designations

Location:

src/SymTab

Files:

• Autogen.cc (modified) (2 diffs)
• Mangler.cc (modified) (2 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
 //
 
@@ -400 +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

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:40:01 2017
-// Update Count     : 20
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 28 15:31:00 2017
+// Update Count     : 21
 //
 
@@ -72 +72 @@
                         } else {
                                 // if we add another kind of overridable function, this has to change
-                                assert( false );
+                                assert( false && "unknown overrideable linkage" );
                         } // if
                 }