Changeset 4e7f0f1 for src/SymTab

Timestamp:

Sep 7, 2016, 11:40:52 AM (9 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:

3b58d91

Parents:

e76acbe (diff), 02cea2d (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 tuples

Location:

src/SymTab

Files:

• Autogen.cc (modified) (2 diffs)
• Validate.cc (modified) (3 diffs)

src/SymTab/Autogen.cc

@@ -280 +280 @@
         }
 
+        void addForwardDecl( FunctionDecl * functionDecl, std::list< Declaration * > & declsToAdd ) {
+                FunctionDecl * decl = functionDecl->clone();
+                delete decl->get_statements();
+                decl->set_statements( NULL );
+                declsToAdd.push_back( decl );
+                decl->fixUniqueId();
+        }
+
         void makeStructFunctions( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd ) {
                 FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
@@ -324 +332 @@
                 copyCtorDecl->fixUniqueId();
                 dtorDecl->fixUniqueId();
+
+                if ( functionNesting == 0 ) {
+                        // forward declare if top-level struct, so that
+                        // type is complete as soon as its body ends
+                        addForwardDecl( assignDecl, declsToAdd );
+                        addForwardDecl( ctorDecl, declsToAdd );
+                        addForwardDecl( copyCtorDecl, declsToAdd );
+                        addForwardDecl( dtorDecl, declsToAdd );
+                }
 
                 // create constructors which take each member type as a parameter.

src/SymTab/Validate.cc

@@ -40 +40 @@
 #include <list>
 #include <iterator>
+#include "Common/ScopedMap.h"
 #include "Common/utility.h"
 #include "Common/UniqueName.h"
@@ -49 +50 @@
 #include "SynTree/Statement.h"
 #include "SynTree/TypeSubstitution.h"
-#include "GenPoly/ScopedMap.h"
 #include "Indexer.h"
 #include "FixFunction.h"
@@ -164 +164 @@
 
                 typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
-                typedef GenPoly::ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
+                typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;