Changeset c0d00b6 for src/SymTab/Autogen.cc

Timestamp:

Nov 25, 2017, 3:22:18 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c6e2c18

Parents:

9d06142 (diff), 3de176d (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 cleanup-dtors

File:

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

src/SymTab/Autogen.cc

@@ -62 +62 @@
                 void previsit( FunctionDecl * functionDecl );
 
-                void previsit( FunctionType * ftype );
-                void previsit( PointerType * ptype );
-
                 void previsit( CompoundStmt * compoundStmt );
 
@@ -72 +69 @@
                 unsigned int functionNesting = 0;     // current level of nested functions
 
-                InitTweak::ManagedTypes managedTypes;
                 std::vector< FuncData > data;
         };
@@ -625 +621 @@
         // generate ctor/dtors/assign for typedecls, e.g., otype T = int *;
         void AutogenerateRoutines::previsit( TypeDecl * typeDecl ) {
-                visit_children = false;
                 if ( ! typeDecl->base ) return;
 
@@ -631 +626 @@
                 TypeFuncGenerator gen( typeDecl, &refType, data, functionNesting, indexer );
                 generateFunctions( gen, declsToAddAfter );
-        }
-
-        void AutogenerateRoutines::previsit( FunctionType *) {
-                // ensure that we don't add assignment ops for types defined as part of the function
-                visit_children = false;
-        }
-
-        void AutogenerateRoutines::previsit( PointerType *) {
-                // ensure that we don't add assignment ops for types defined as part of the pointer
-                visit_children = false;
+
         }
 
@@ -648 +634 @@
         }
 
-        void AutogenerateRoutines::previsit( FunctionDecl * functionDecl ) {
-                visit_children = false;
-                // record the existence of this function as appropriate
-                managedTypes.handleDWT( functionDecl );
-
-                maybeAccept( functionDecl->type, *visitor );
+        void AutogenerateRoutines::previsit( FunctionDecl * ) {
+                // Track whether we're currently in a function.
+                // Can ignore function type idiosyncrasies, because function type can never
+                // declare a new type.
                 functionNesting += 1;
-                maybeAccept( functionDecl->statements, *visitor );
-                functionNesting -= 1;
+                GuardAction( [this]()  { functionNesting -= 1; } );
         }
 
         void AutogenerateRoutines::previsit( CompoundStmt * ) {
-                GuardScope( managedTypes );
                 GuardScope( structsDone );
         }