Changeset b826e6b for src/SymTab/Autogen.cc

Timestamp:

Jul 19, 2017, 11:49:33 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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:software/cfa/cfa-cc

File:

• src/SymTab/Autogen.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 : Fri Jul 14 16:41:00 2017
+// Update Count     : 62
 //
 
@@ -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::BuiltinCFA ||
+                         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