Changeset 077810d for src/SymTab

Timestamp:

Mar 31, 2017, 12:16:19 PM (9 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, stuck-waitfor-destruct, with_gc

Children:

24c18ea, 78d3dd5

Parents:

9d944b2 (diff), 936a287 (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)
• Validate.cc (modified) (3 diffs)

src/SymTab/Indexer.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 08:07:34 2017
-// Update Count     : 17
+// Last Modified On : Thu Mar 30 16:38:47 2017
+// Update Count     : 19
 //
 
@@ -483 +483 @@
         void Indexer::visit( CompoundLiteralExpr *compLitExpr ) {
                 acceptNewScope( compLitExpr->get_result(), *this );
-                maybeAccept( compLitExpr->get_type(), *this );
                 maybeAccept( compLitExpr->get_initializer(), *this );
         }

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 16:39:15 2017
-// Update Count     : 353
+// Last Modified On : Thu Mar 30 16:50:13 2017
+// Update Count     : 357
 //
 
@@ -222 +222 @@
                 CompoundLiteral compoundliteral;
 
+                HoistStruct::hoistStruct( translationUnit );
                 EliminateTypedef::eliminateTypedef( translationUnit );
-                HoistStruct::hoistStruct( translationUnit );
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
@@ -824 +824 @@
                 static UniqueName indexName( "_compLit" );
 
-                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, 0, compLitExpr->get_type(), compLitExpr->get_initializer() );
-                compLitExpr->set_type( 0 );
+                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, 0, compLitExpr->get_result(), compLitExpr->get_initializer() );
+                compLitExpr->set_result( 0 );
                 compLitExpr->set_initializer( 0 );
                 delete compLitExpr;