Changeset 933f32f for src/Common/PassVisitor.impl.h

Timestamp:

May 24, 2019, 10:19:41 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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 cleanup-dtors

File:

• src/Common/PassVisitor.impl.h (modified) (16 diffs)

src/Common/PassVisitor.impl.h

@@ -20 +20 @@
 
 #define MUTATE_END( type, node )                \
-        return call_postmutate< type * >( node ); \
+        auto __return = call_postmutate< type * >( node ); \
+        assert( __return ); \
+        return __return;
 
 
@@ -67 +69 @@
         SemanticErrorException errors;
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
+
+
                 // splice in new declarations after previous decl
                 if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
@@ -83 +90 @@
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -94 +102 @@
         SemanticErrorException errors;
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
@@ -109 +120 @@
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -126 +138 @@
         if ( ! visitor.get_visit_children() ) return;
         SemanticErrorException errors;
+
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
@@ -135 +151 @@
                 }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -151 +168 @@
 template< typename Container, typename pass_type >
 inline void maybeMutate_impl( Container & container, PassVisitor< pass_type > & mutator ) {
+
         if ( ! mutator.get_visit_children() ) return;
         SemanticErrorException errors;
+
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
@@ -163 +185 @@
                 } // try
         } // for
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -185 +208 @@
         DeclList_t* afterDecls  = get_afterDecls();
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
 
@@ -192 +218 @@
                 try {
                         func( *i );
+                        assert( *i );
                         assert(( empty( beforeStmts ) && empty( afterStmts ))
                             || ( empty( beforeDecls ) && empty( afterDecls )) );
@@ -202 +229 @@
                 if ( !empty( beforeStmts ) ) { statements.splice( i, *beforeStmts ); }
         }
+        pass_visitor_stats.depth--;
 
         if ( !empty( afterDecls ) ) { splice( std::back_inserter( statements ), afterDecls); }
@@ -229 +257 @@
 
         // don't want statements from outer CompoundStmts to be added to this CompoundStmt
-        ValueGuardPtr< TypeSubstitution * >  oldEnv        ( get_env_ptr    () );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< DeclList_t >          oldBeforeDecls( get_beforeDecls() );
         ValueGuardPtr< DeclList_t >          oldAfterDecls ( get_afterDecls () );
@@ -1965 +1993 @@
 
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
-        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
@@ -1982 +2010 @@
 
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
-        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
@@ -2678 +2706 @@
 
 //--------------------------------------------------------------------------
-// Subrange
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( Subrange * node ) {
-        VISIT_START( node );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Subrange * PassVisitor< pass_type >::mutate( Subrange * node  )  {
-        MUTATE_START( node );
-
-        MUTATE_END( Subrange, node );
-}
-
-//--------------------------------------------------------------------------
 // Attribute
 template< typename pass_type >