Changeset fdd0509

Timestamp:

Dec 22, 2017, 4:15:24 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ddb80bd

Parents:

c1bf35f

Message:

Hoist non-constexpr array dimensions

File:

• src/InitTweak/GenInit.cc (modified) (5 diffs)

src/InitTweak/GenInit.cc

@@ -30 +30 @@
 #include "InitTweak.h"             // for isConstExpr, InitExpander, checkIn...
 #include "Parser/LinkageSpec.h"    // for isOverridable, C
+#include "ResolvExpr/Resolver.h"
 #include "SymTab/Autogen.h"        // for genImplicitCall, SizeType
 #include "SymTab/Mangler.h"        // for Mangler
@@ -89 +90 @@
         };
 
-        struct HoistArrayDimension final : public WithDeclsToAdd, public WithShortCircuiting, public WithGuards {
+        struct HoistArrayDimension final : public WithDeclsToAdd, public WithShortCircuiting, public WithGuards, public WithIndexer {
                 /// hoist dimension from array types in object declaration so that it uses a single
                 /// const variable of type size_t, so that side effecting array dimensions are only
@@ -104 +105 @@
                 void premutate( FunctionType * ) { visit_children = false; }
 
+                // need this so that enumerators are added to the indexer, due to premutate(AggregateDecl *)
+                void premutate( EnumDecl * ) {}
+
                 void hoist( Type * type );
 
@@ -180 +184 @@
                         if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
 
+                        // need to resolve array dimensions in order to accurately determine if constexpr
+                        ResolvExpr::findSingleExpression( arrayType->dimension, SymTab::SizeType->clone(), indexer );
                         // don't need to hoist dimension if it's a constexpr - only need to if there's potential for side effects.
                         if ( isConstExpr( arrayType->get_dimension() ) ) return;
@@ -196 +202 @@
         void HoistArrayDimension::premutate( FunctionDecl * ) {
                 GuardValue( inFunction );
+                inFunction = true;
         }