Changeset 09a1ae6

Timestamp:

Apr 12, 2018, 11:57:51 AM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

f229fc2

Parents:

34dcc474

Message:

Fix some missing static roots -- GC'd CFA-CC now builds prelude

Location:

src

Files:

• Common/PassVisitor.impl.h (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)

src/Common/PassVisitor.impl.h

@@ -1171 +1171 @@
         indexerScopedAccept( node->result, *this );
 
+        // xxx - not quite sure why this doesn't visit( node->function );
         for ( auto expr : node->args ) {
                 visitExpression( expr );

src/InitTweak/InitTweak.cc

@@ -5 +5 @@
 #include <memory>                  // for __shared_ptr
 
+#include "Common/GC.h"             // for new_static_root
 #include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
@@ -523 +524 @@
                         // This operator could easily exist as a real function, but it's tricky because nothing should resolve to this function.
                         TypeDecl * td = new TypeDecl( "T", noStorageClasses, nullptr, TypeDecl::Dtype, true );
-                        assign = new FunctionDecl( "?=?", noStorageClasses, LinkageSpec::Intrinsic, SymTab::genAssignType( new TypeInstType( noQualifiers, td->name, td ) ), nullptr );
+                        assign = new_static_root<FunctionDecl>( 
+                                "?=?", noStorageClasses, LinkageSpec::Intrinsic, 
+                                SymTab::genAssignType( new TypeInstType( noQualifiers, td->name, td ) ), nullptr );
                 }
                 if ( dynamic_cast< ReferenceType * >( dst->result ) ) {

src/ResolvExpr/AlternativeFinder.cc

@@ -35 +35 @@
 #include "ResolveTypeof.h"         // for resolveTypeof
 #include "Resolver.h"              // for resolveStmtExpr
+#include "Common/GC.h"             // for new_static_root
 #include "SymTab/Indexer.h"        // for Indexer
 #include "SymTab/Mangler.h"        // for Mangler
@@ -1084 +1085 @@
 
                 // find function operators
-                static NameExpr *opExpr = new NameExpr( "?()" );
+                static auto *opExpr = new_static_root<NameExpr>( "?()" );
                 AlternativeFinder funcOpFinder( indexer, env );
                 // it's ok if there aren't any defined function ops