Changes in / [8ca26d5:0b996a1]

Location:

src

Files:

• InitTweak/GenInit.cc (modified) (1 diff)
• main.cc (modified) (1 diff)

src/InitTweak/GenInit.cc

@@ -202 +202 @@
                         }
                         // don't need to hoist dimension if it's definitely pure - only need to if there's potential for side effects.
-                        // xxx - hoisting has no side effects anyways, so don't skip since we delay resolve
-                        // still try to detect constant expressions
-                        if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
+                        // xxx - hoisting has no side effects anyways, so don't skip since we delay resolve     
+                        // only skip in the most trivial case, which does not require resolve
+                        if (dynamic_cast<ConstantExpr *>(arrayType->dimension)) return;
+                        // if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
 
                         ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, Validate::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );

src/main.cc

@@ -341 +341 @@
 
                 if( useNewAST) {
-                        if (Stats::Counters::enabled) {
-                                ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
-                                ast::pass_visitor_stats.max = Stats::Counters::build<Stats::Counters::MaxCounter<double>>("Max depth - New");
-                        }
                         auto transUnit = convert( move( translationUnit ) );
                         PASS( "Resolve", ResolvExpr::resolve( transUnit ) );