Changeset f9cebb5 for src/InitTweak/InitTweak.cc

Timestamp:

Aug 4, 2016, 4:10:06 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4819cac

Parents:

73bf8cf2

Message:

add gcc attributes to ObjectDecl?, hoist destructed static variables, add breaks to end of generated switch

File:

• src/InitTweak/InitTweak.cc (modified) (7 diffs)

src/InitTweak/InitTweak.cc

@@ -5 +5 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Expression.h"
+#include "SynTree/Attribute.h"
 #include "GenPoly/GenPoly.h"
 
@@ -125 +126 @@
 
         namespace {
+                /// given index i, dimension d, initializer init, and callExpr f, generates
+                ///   if (i < d) f(..., init)
+                ///   ++i;
+                /// so that only elements within the range of the array are constructed
                 template< typename OutIterator >
-                void dothething( UntypedExpr * callExpr, Expression * index, Expression * dimension, Initializer * init, OutIterator out ) {
+                void buildCallExpr( UntypedExpr * callExpr, Expression * index, Expression * dimension, Initializer * init, OutIterator out ) {
                         UntypedExpr * cond = new UntypedExpr( new NameExpr( "?<?") );
                         cond->get_args().push_back( index->clone() );
@@ -148 +153 @@
                         Expression * dimension = *idx++;
 
+                        // xxx - may want to eventually issue a warning here if we can detect
+                        // that the number of elements exceeds to dimension of the array
                         if ( idx == idxEnd ) {
                                 if ( ListInit * listInit = dynamic_cast< ListInit * >( init ) ) {
                                         for ( Initializer * init : *listInit ) {
-                                                dothething( callExpr->clone(), index, dimension, init, out );
+                                                buildCallExpr( callExpr->clone(), index, dimension, init, out );
                                         }
                                 } else {
-                                        dothething( callExpr->clone(), index, dimension, init, out );
+                                        buildCallExpr( callExpr->clone(), index, dimension, init, out );
                                 }
                         } else {
@@ -166 +173 @@
                                         throw SemanticError( "unbalanced list initializers" );
                                 }
+
+                                static UniqueName targetLabel( "L__autogen__" );
+                                Label switchLabel( targetLabel.newName(), 0, std::list< Attribute * >{ new Attribute("unused") } );
                                 for ( Initializer * init : *listInit ) {
                                         Expression * condition;
@@ -178 +188 @@
                                         std::list< Statement * > stmts;
                                         build( callExpr, idx, idxEnd, init, back_inserter( stmts ) );
+                                        stmts.push_back( new BranchStmt( noLabels, switchLabel, BranchStmt::Break ) );
                                         CaseStmt * caseStmt = new CaseStmt( noLabels, condition, stmts );
                                         branches.push_back( caseStmt );
                                 }
                                 *out++ = new SwitchStmt( noLabels, index->clone(), branches );
+                                *out++ = new NullStmt( std::list<Label>{ switchLabel } );
                         }
                 }
@@ -194 +206 @@
         Statement * InitImpl::buildListInit( UntypedExpr * dst, std::list< Expression * > & indices ) {
                 if ( ! init ) return NULL;
-                std::list< Statement * > results;
-                build( dst, indices.begin(), indices.end(), init, back_inserter( results ) );
-                assert( results.size() <= 1 );
-                if ( results.empty() ) {
+                CompoundStmt * block = new CompoundStmt( noLabels );
+                build( dst, indices.begin(), indices.end(), init, back_inserter( block->get_kids() ) );
+                if ( block->get_kids().empty() ) {
+                        delete block;
                         return NULL;
                 } else {
                         init = NULL; // init was consumed in creating the list init
-                        return results.front();
-                }
-                return ! results.empty() ? results.front() : NULL;
+                        return block;
+                }
         }
 
@@ -280 +291 @@
         }
 
-        bool isInstrinsicSingleArgCallStmt( Statement * stmt ) {
+        bool isIntrinsicSingleArgCallStmt( Statement * stmt ) {
                 std::list< Expression * > callExprs;
                 collectCtorDtorCalls( stmt, callExprs );