Ignore:
Timestamp:
Aug 14, 2017, 2:03:39 PM (5 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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:
74b007ba
Parents:
fd344aa (diff), 54cd58b (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 references

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Autogen.cc

    rfd344aa r9236060  
    1010// Created On       : Thu Mar 03 15:45:56 2016
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Wed Jun 28 15:30:00 2017
    13 // Update Count     : 61
     12// Last Modified On : Fri Jul 14 16:41:00 2017
     13// Update Count     : 62
    1414//
    1515
    16 #include <list>
    17 #include <iterator>
    18 #include "SynTree/Visitor.h"
    19 #include "SynTree/Attribute.h"
    20 #include "SynTree/Type.h"
    21 #include "SynTree/Statement.h"
    22 #include "SynTree/TypeSubstitution.h"
    23 #include "Common/utility.h"
    24 #include "CodeGen/OperatorTable.h"
    25 #include "AddVisit.h"
    26 #include "MakeLibCfa.h"
    2716#include "Autogen.h"
    28 #include "GenPoly/ScopedSet.h"
    29 #include "Common/ScopedMap.h"
    30 #include "SymTab/Mangler.h"
    31 #include "GenPoly/DeclMutator.h"
     17
     18#include <algorithm>               // for count_if
     19#include <cassert>                 // for safe_dynamic_cast, assert, assertf
     20#include <iterator>                // for back_insert_iterator, back_inserter
     21#include <list>                    // for list, _List_iterator, list<>::iter...
     22#include <set>                     // for set, _Rb_tree_const_iterator
     23#include <vector>                  // for vector
     24
     25#include "AddVisit.h"              // for addVisit
     26#include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
     27#include "Common/ScopedMap.h"      // for ScopedMap<>::const_iterator, Scope...
     28#include "Common/utility.h"        // for cloneAll, operator+
     29#include "GenPoly/DeclMutator.h"   // for DeclMutator
     30#include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::iterator
     31#include "SymTab/Mangler.h"        // for Mangler
     32#include "SynTree/Attribute.h"     // For Attribute
     33#include "SynTree/Mutator.h"       // for maybeMutate
     34#include "SynTree/Statement.h"     // for CompoundStmt, ReturnStmt, ExprStmt
     35#include "SynTree/Type.h"          // for FunctionType, Type, TypeInstType
     36#include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
     37
     38class Attribute;
    3239
    3340namespace SymTab {
     
    396403        void makeStructFunctions( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd, const std::vector< FuncData > & data ) {
    397404                // Builtins do not use autogeneration.
    398                 if ( aggregateDecl->get_linkage() == LinkageSpec::Builtin ||
     405                if ( aggregateDecl->get_linkage() == LinkageSpec::BuiltinCFA ||
    399406                         aggregateDecl->get_linkage() == LinkageSpec::BuiltinC ) {
    400407                        return;
Note: See TracChangeset for help on using the changeset viewer.