Changes in src/Common/PassVisitor.impl.h [9a705dc8:09a1ae6]

File:

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

src/Common/PassVisitor.impl.h

@@ -38 +38 @@
         MUTATE_END( type, node );      \
 
-
+#include "Common/GC.h"
 
 template<typename T>
@@ -397 +397 @@
                         auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                         // implicit add __func__ identifier as specified in the C manual 6.4.2.2
-                        static ObjectDecl func(
+                        static ObjectDecl* func = new_static_root<ObjectDecl>(
                                 "__func__", noStorageClasses, LinkageSpec::C, nullptr,
                                 new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
                                 nullptr
                         );
-                        indexerAddId( &func );
+                        indexerAddId( func );
                         maybeAccept_impl( node->type, *this );
                         maybeAccept_impl( node->statements, *this );
@@ -427 +427 @@
                         auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                         // implicit add __func__ identifier as specified in the C manual 6.4.2.2
-                        static ObjectDecl func(
+                        static ObjectDecl* func = new_static_root<ObjectDecl>(
                                 "__func__", noStorageClasses, LinkageSpec::C, nullptr,
                                 new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
                                 nullptr
                         );
-                        indexerAddId( &func );
+                        indexerAddId( func );
                         maybeMutate_impl( node->type, *this );
                         maybeMutate_impl( node->statements, *this );
@@ -682 +682 @@
 
         MUTATE_END( AsmDecl, node );
-}
-
-//--------------------------------------------------------------------------
-// StaticAssertDecl
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( StaticAssertDecl * node ) {
-        VISIT_START( node );
-
-        maybeAccept_impl( node->condition, *this );
-        maybeAccept_impl( node->message  , *this );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-StaticAssertDecl * PassVisitor< pass_type >::mutate( StaticAssertDecl * node ) {
-        MUTATE_START( node );
-
-        maybeMutate_impl( node->condition, *this );
-        maybeMutate_impl( node->message  , *this );
-
-        MUTATE_END( StaticAssertDecl, node );
 }
 
@@ -1193 +1171 @@
         indexerScopedAccept( node->result, *this );
 
+        // xxx - not quite sure why this doesn't visit( node->function );
         for ( auto expr : node->args ) {
                 visitExpression( expr );
@@ -1249 +1228 @@
 template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( CastExpr * node ) {
-        MUTATE_START( node );
-
-        indexerScopedMutate( node->env   , *this );
-        indexerScopedMutate( node->result, *this );
-        maybeMutate_impl   ( node->arg   , *this );
-
-        MUTATE_END( Expression, node );
-}
-
-//--------------------------------------------------------------------------
-// KeywordCastExpr
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( KeywordCastExpr * node ) {
-        VISIT_START( node );
-
-        indexerScopedAccept( node->result, *this );
-        maybeAccept_impl        ( node->arg   , *this );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( KeywordCastExpr * node ) {
         MUTATE_START( node );
 
@@ -1535 +1491 @@
         indexerScopedAccept( node->result, *this );
         maybeAccept_impl   ( node->type  , *this );
+        maybeAccept_impl   ( node->member, *this );
 
         VISIT_END( node );
@@ -1546 +1503 @@
         indexerScopedMutate( node->result, *this );
         maybeMutate_impl   ( node->type  , *this );
+        maybeMutate_impl   ( node->member, *this );
 
         MUTATE_END( Expression, node );
@@ -2599 +2557 @@
 // TypeSubstitution
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( TypeSubstitution * node ) {
+        VISIT_START( node );
+
+        for ( auto & p : node->typeEnv ) {
+                indexerScopedAccept( p.second, *this );
+        }
+        for ( auto & p : node->varEnv ) {
+                indexerScopedAccept( p.second, *this );
+        }
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
 TypeSubstitution * PassVisitor< pass_type >::mutate( TypeSubstitution * node ) {
         MUTATE_START( node );