Changeset bd06384 for src/Common/PassVisitor.impl.h

Timestamp:

Mar 22, 2018, 4:49:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

dbc2c2c

Parents:

7e4b44db

Message:

Add static roots to GC; fix some static GC_Objects

File:

• src/Common/PassVisitor.impl.h (modified) (3 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 );