Changeset bdad6eb7

Timestamp:

Dec 14, 2017, 10:44:23 AM (6 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:

c470ada

Parents:

71d0eab

Message:

Modify HoistStruct? to track parent aggregate

File:

• src/SymTab/Validate.cc (modified) (2 diffs)

src/SymTab/Validate.cc

@@ -94 +94 @@
                 template< typename AggDecl > void handleAggregate( AggDecl *aggregateDecl );
 
-                bool inStruct = false;
+                AggregateDecl * parentAggr = nullptr;
         };
 
@@ -303 +303 @@
         template< typename AggDecl >
         void HoistStruct::handleAggregate( AggDecl *aggregateDecl ) {
-                if ( inStruct ) {
+                if ( parentAggr ) {
                         // Add elements in stack order corresponding to nesting structure.
                         declsToAddBefore.push_front( aggregateDecl );
                 } else {
-                        GuardValue( inStruct );
-                        inStruct = true;
+                        GuardValue( parentAggr );
+                        parentAggr = aggregateDecl;
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.