Changeset 300d75b

Timestamp:

Jan 3, 2018, 10:10:20 AM (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:

4e22d7d

Parents:

b3048d4

Message:

Tighten the case where array dimension is hoisted

File:

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

src/InitTweak/GenInit.cc

@@ -41 +41 @@
 #include "SynTree/Type.h"          // for Type, ArrayType, Type::Qualifiers
 #include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
+#include "Tuples/Tuples.h"         // for maybeImpure
 
 namespace InitTweak {
@@ -186 +187 @@
                         // 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;
+                        // don't need to hoist dimension if it's definitely pure - only need to if there's potential for side effects.
+                        if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
 
                         ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );