Changeset bee0694 for src/ControlStruct

Timestamp:

Jan 29, 2019, 4:15:27 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

bbbc067

Parents:

70a1c3ae

Message:

Changed std::list<Label> to vector

Location:

src/ControlStruct

Files:

• LabelFixer.cc (modified) (3 diffs)
• LabelFixer.h (modified) (1 diff)
• MLEMutator.cc (modified) (4 diffs)

src/ControlStruct/LabelFixer.cc

@@ -50 +50 @@
         // prune to at most one label definition for each statement
         void LabelFixer::previsit( Statement *stmt ) {
-                std::list< Label > &labels = stmt->get_labels();
+                std::vector< Label >  &labels = stmt->get_labels();
 
                 if ( ! labels.empty() ) {
@@ -77 +77 @@
         // sets the definition of the labelTable entry to be the provided
         // statement for every label in the list parameter. Happens for every kind of statement
-        Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
+        Label LabelFixer::setLabelsDef( std::vector< Label >  &llabel, Statement *definition ) {
                 assert( definition != 0 );
                 assert( llabel.size() > 0 );
@@ -83 +83 @@
                 Entry * e = new Entry( definition );
 
-                for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
+                for ( std::vector< Label > ::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
                         Label & l = *i;
                         l.set_statement( definition ); // attach statement to the label to be used later

src/ControlStruct/LabelFixer.h

@@ -46 +46 @@
                 void previsit( LabelAddressExpr *addrExpr );
 
-                Label setLabelsDef( std::list< Label > &, Statement *definition );
+                Label setLabelsDef( std::vector< Label >  &, Statement *definition );
                 template< typename UsageNode >
                 void setLabelsUsg( Label, UsageNode *usage = 0 );

src/ControlStruct/MLEMutator.cc

@@ -70 +70 @@
                         if ( ! get_breakLabel().empty() ) {
                                 std::list< Statement * >::iterator next = k+1;
-                                std::list<Label> ls; ls.push_back( get_breakLabel() );
+                                std::vector< Label >  ls; ls.push_back( get_breakLabel() );
                                 kids.insert( next, new NullStmt( ls ) );
                                 set_breakLabel("");
@@ -242 +242 @@
                 if ( e.isContUsed() ) {
                         // continue label goes in the body as the last statement
-                        std::list< Label > labels; labels.push_back( e.useContExit() );
+                        std::vector< Label >  labels; labels.push_back( e.useContExit() );
                         newBody->get_kids().push_back( new NullStmt( labels ) );
                 } // if
@@ -336 +336 @@
                                 assert( ! enclosingControlStructures.empty() );
                                 if ( enclosingControlStructures.back().isFallUsed() ) {
-                                        std::list<Label> ls{ enclosingControlStructures.back().useFallExit() };
+                                        std::vector< Label >  ls{ enclosingControlStructures.back().useFallExit() };
                                         caseStmt->stmts.push_back( new NullStmt( ls ) );
                                 } // if
@@ -346 +346 @@
                         if ( enclosingControlStructures.back().isFallDefaultUsed() ) {
                                 // add fallthrough default label if necessary
-                                std::list<Label> ls{ enclosingControlStructures.back().useFallDefaultExit() };
+                                std::vector< Label >  ls{ enclosingControlStructures.back().useFallDefaultExit() };
                                 caseStmt->stmts.push_front( new NullStmt( ls ) );
                         } // if