Changeset 0720e049 for src/SymTab/Autogen.cc

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 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:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (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

File:

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

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 28 15:30:00 2017
-// Update Count     : 61
+// Last Modified On : Fri Jul 14 16:41:00 2017
+// Update Count     : 62
 //
-
-#include <list>
-#include <iterator>
-#include "SynTree/Visitor.h"
-#include "SynTree/Type.h"
-#include "SynTree/Statement.h"
-#include "SynTree/TypeSubstitution.h"
-#include "Common/utility.h"
-#include "AddVisit.h"
-#include "MakeLibCfa.h"
 #include "Autogen.h"
-#include "GenPoly/ScopedSet.h"
-#include "Common/ScopedMap.h"
-#include "SymTab/Mangler.h"
-#include "GenPoly/DeclMutator.h"
+
+#include <algorithm>               // for count_if
+#include <cassert>                 // for safe_dynamic_cast, assert, assertf
+#include <iterator>                // for back_insert_iterator, back_inserter
+#include <list>                    // for list, _List_iterator, list<>::iter...
+#include <set>                     // for set, _Rb_tree_const_iterator
+#include <vector>                  // for vector
+
+#include "AddVisit.h"              // for addVisit
+#include "Common/ScopedMap.h"      // for ScopedMap<>::const_iterator, Scope...
+#include "Common/utility.h"        // for cloneAll, operator+
+#include "GenPoly/DeclMutator.h"   // for DeclMutator
+#include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::iterator
+#include "SymTab/Mangler.h"        // for Mangler
+#include "SynTree/Mutator.h"       // for maybeMutate
+#include "SynTree/Statement.h"     // for CompoundStmt, ReturnStmt, ExprStmt
+#include "SynTree/Type.h"          // for FunctionType, Type, TypeInstType
+#include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
+
+class Attribute;
 
 namespace SymTab {
@@ -401 +407 @@
         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 ||
+                if ( aggregateDecl->get_linkage() == LinkageSpec::BuiltinCFA ||
                          aggregateDecl->get_linkage() == LinkageSpec::BuiltinC ) {
                         return;
@@ -512 +518 @@
                 // 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
-                
+
                 // default ctor/dtor need only first parameter
                 // void ?{}(T *); void ^?{}(T *);