Changeset 5b51f5e for src/SymTab/Validate.cc

Timestamp:

Jan 5, 2018, 3:21:42 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

65deb18, cae28da

Parents:

5c4f2c2 (diff), b834e98 (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:software/cfa/cfa-cc

File:

• src/SymTab/Validate.cc (modified) (3 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.
@@ -754 +754 @@
                                 throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );
                         }
-                        // cannot redefine VLA typedefs
+                        // Cannot redefine VLA typedefs. Note: this is slightly incorrect, because our notion of VLAs
+                        // at this point in the translator is imprecise. In particular, this will disallow redefining typedefs
+                        // with arrays whose dimension is an enumerator or a cast of a constant/enumerator. The effort required
+                        // to fix this corner case likely outweighs the utility of allowing it.
                         if ( isVariableLength( t1 ) || isVariableLength( t2 ) ) {
                                 throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );