Changeset fba44f8

Timestamp:

Sep 1, 2016, 11:25:38 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

0362d42, 4d4882a

Parents:

c8dfcd3 (diff), 90e2334 (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 ctor

File:

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

src/SymTab/Validate.cc

@@ -86 +86 @@
 
         /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers.
-        class Pass1 : public Visitor {
+        class EnumAndPointerDecayPass : public Visitor {
                 typedef Visitor Parent;
                 virtual void visit( EnumDecl *aggregateDecl );
@@ -189 +189 @@
 
         void validate( std::list< Declaration * > &translationUnit, bool doDebug ) {
-                Pass1 pass1;
+                EnumAndPointerDecayPass epc;
                 Pass2 pass2( doDebug, 0 );
                 Pass3 pass3( 0 );
@@ -196 +196 @@
                 EliminateTypedef::eliminateTypedef( translationUnit );
                 HoistStruct::hoistStruct( translationUnit );
-                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs Pass1
-                acceptAll( translationUnit, pass1 );
+                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
+                acceptAll( translationUnit, epc );
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
@@ -206 +206 @@
 
         void validateType( Type *type, const Indexer *indexer ) {
-                Pass1 pass1;
+                EnumAndPointerDecayPass epc;
                 Pass2 pass2( false, indexer );
                 Pass3 pass3( indexer );
-                type->accept( pass1 );
+                type->accept( epc );
                 type->accept( pass2 );
                 type->accept( pass3 );
@@ -272 +272 @@
         }
 
-        void Pass1::visit( EnumDecl *enumDecl ) {
+        void EnumAndPointerDecayPass::visit( EnumDecl *enumDecl ) {
                 // Set the type of each member of the enumeration to be EnumConstant
                 for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
@@ -296 +296 @@
                                 DWTIterator j = i;
                                 ++i;
+                                delete *j;
                                 dwts.erase( j );
                                 if ( i != end ) {
@@ -313 +314 @@
         }
 
-        void Pass1::visit( FunctionType *func ) {
+        void EnumAndPointerDecayPass::visit( FunctionType *func ) {
                 // Fix up parameters and return types
                 fixFunctionList( func->get_parameters(), func );