Changeset b6838214 for src/InitTweak/GenInit.cc

Timestamp:

Jan 23, 2018, 5:46:43 PM (6 years ago)

Author:

Alan Kennedy <afakenne@…>

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:

258e6ad5

Parents:

b158d8f (diff), 15d248e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

add context switch for ARM

File:

• src/InitTweak/GenInit.cc (modified) (8 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
@@ -40 +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 {
@@ -89 +91 @@
         };
 
-        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 +106 @@
                 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 );
 
@@ -135 +140 @@
                                 if ( varExpr->var == retVal ) return;
                         }
-                        stmtsToAddBefore.push_back( genCtorDtor( "?{}", retVal, returnStmt->get_expr() ) );
+                        Statement * stmt = genCtorDtor( "?{}", retVal, returnStmt->expr );
+                        assertf( stmt, "ReturnFixer: genCtorDtor returned nullptr: %s / %s", toString( retVal ).c_str(), toString( returnStmt->expr ).c_str() );
+                        stmtsToAddBefore.push_back( stmt );
 
                         // return the retVal object
@@ -178 +185 @@
                         if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
 
-                        // 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;
+                        // need to resolve array dimensions in order to accurately determine if constexpr
+                        ResolvExpr::findSingleExpression( arrayType->dimension, SymTab::SizeType->clone(), indexer );
+                        // array is variable-length when the dimension is not constexpr
+                        arrayType->isVarLen = ! isConstExpr( arrayType->dimension );
+                        // 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() ) );
@@ -194 +205 @@
         void HoistArrayDimension::premutate( FunctionDecl * ) {
                 GuardValue( inFunction );
+                inFunction = true;
         }
 
@@ -220 +232 @@
                 Type * type = objDecl->get_type();
                 while ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
+                        // must always construct VLAs with an initializer, since this is an error in C
+                        if ( at->isVarLen && objDecl->init ) return true;
                         type = at->get_base();
                 }