Changeset 9cdfb4d0 for src/SymTab

Timestamp:

Jan 22, 2018, 3:09:01 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct, with_gc

Children:

e23d20b

Parents:

326cd2b (diff), 4bf3b2b (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

Location:

src/SymTab

Files:

• Indexer.cc (modified) (2 diffs)
• Indexer.h (modified) (1 diff)
• Validate.cc (modified) (3 diffs)

src/SymTab/Indexer.cc

@@ -572 +572 @@
         }
 
+        void Indexer::addMembers( AggregateDecl * aggr, Expression * expr ) {
+                for ( Declaration * decl : aggr->members ) {
+                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                addId( dwt, expr );
+                                if ( dwt->name == "" ) {
+                                        Type * t = dwt->get_type()->stripReferences();
+                                        if ( dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t ) ) {
+                                                Expression * base = expr->clone();
+                                                ResolvExpr::referenceToRvalueConversion( base );
+                                                addMembers( t->getAggr(), new MemberExpr( dwt, base ) );
+                                        }
+                                }
+                        }
+                }
+        }
+
         void Indexer::addWith( WithStmt * stmt ) {
                 for ( Expression * expr : stmt->exprs ) {
@@ -578 +594 @@
                                 assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
 
-                                for ( Declaration * decl : aggr->members ) {
-                                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                                                addId( dwt, expr );
-                                        }
-                                }
+                                addMembers( aggr, expr );
                         }
                 }

src/SymTab/Indexer.h

@@ -86 +86 @@
                 void addWith( WithStmt * );
 
+                /// adds all of the members of the Aggregate (addWith helper)
+                void addMembers( AggregateDecl * aggr, Expression * expr );
+
                 /// convenience function for adding a list of Ids to the indexer
                 void addIds( const std::list< DeclarationWithType * > & decls );

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 );