convert bl_enlist() to Barray

Author: WalterBright

src/dmd/backend/blockopt.d

@@ -1599,11 +1599,27 @@ private void blreturn()
 }
 
 /*****************************************
- * Convert expression into a list.
- * Construct the list in reverse, that is, so that the right-most
- * expression occurs first in the list.
+ * Convert comma-expressions into an array of expressions.
  */
 
+extern (D)
+private void bl_enlist2(ref Barray!(elem*) elems, elem* e)
+{
+    if (e)
+    {
+        elem_debug(e);
+        if (e.Eoper == OPcomma)
+        {
+            bl_enlist2(elems, e.EV.E1);
+            bl_enlist2(elems, e.EV.E2);
+            e.EV.E1 = e.EV.E2 = null;
+            el_free(e);
+        }
+        else
+            elems.push(e);
+    }
+}
+
 private list_t bl_enlist(elem *e)
 {
     list_t el = null;
@@ -1635,6 +1651,17 @@ private list_t bl_enlist(elem *e)
  * Take a list of expressions and convert it back into an expression tree.
  */
 
+extern (D)
+private elem* bl_delist2(elem*[] elems)
+{
+    elem* result = null;
+    foreach (e; elems)
+    {
+        result = el_combine(result, e);
+    }
+    return result;
+}
+
 private elem * bl_delist(list_t el)
 {
     elem *e = null;
@@ -2201,6 +2228,8 @@ private int el_anyframeptr(elem *e)
 
 private void blassertsplit()
 {
+    debug if (debugc) printf("blassertsplit()\n");
+    Barray!(elem*) elems;
     for (block *b = startblock; b; b = b.Bnext)
     {
         /* Not sure of effect of jumping out of a try block
@@ -2211,7 +2240,9 @@ private void blassertsplit()
         if (b.BC == BCexit)
             continue;
 
-        list_t bel = list_reverse(bl_enlist(b.Belem));
+        elems.reset();
+        bl_enlist2(elems, b.Belem);
+        auto earray = elems[];
     L1:
         int dctor = 0;
 
@@ -2231,26 +2262,23 @@ private void blassertsplit()
                     continue;
                 }
                 else if (e.Eoper == OPdctor)
-                ++dctor;
+                    ++dctor;
                 else if (e.Eoper == OPddtor)
-                --dctor;
+                    --dctor;
                 break;
             }
             return dctor;
         }
 
-        foreach (el; ListRange(bel))
+        foreach (i, e; earray)
         {
-            elem *e = list_elem(el);
-
             if (!(dctor == 0 &&   // don't split block between a dctor..ddtor pair
                 e.Eoper == OPoror && e.EV.E2.Eoper == OPcall && e.EV.E2.EV.E1.Eoper == OPvar))
             {
                 accumDctor(e);
                 continue;
             }
             Symbol *f = e.EV.E2.EV.E1.EV.Vsym;
-
             if (!(f.Sflags & SFLexit))
             {
                 accumDctor(e);
@@ -2283,7 +2311,7 @@ private void blassertsplit()
                 bx = bxn;
             }
 
-            el.ptr = cast(void *)e.EV.E1;
+            earray[i] = e.EV.E1;
             e.EV.E1 = null;
             e.EV.E2 = null;
             el_free(e);
@@ -2297,9 +2325,8 @@ private void blassertsplit()
             b.Bnext = b2;
             b2.BC = b.BC;
             b2.BS = b.BS;
-            list_t bex = list_next(el);
-            el.next = null;
-            b.Belem = bl_delist(list_reverse(bel));
+
+            b.Belem = bl_delist2(earray[0 .. i + 1]);
 
             /* Transfer successors of b to b2.
              * Fix up predecessors of successors to b2 to point to b2 instead of b
@@ -2324,12 +2351,17 @@ private void blassertsplit()
             list_append(&bexit.Bpred, b);
 
             b = b2;
-            bel = bex;  // remainder of expression list goes into b2
+            earray = earray[i + 1 .. earray.length];  // rest of expressions go into b2
+            debug if (debugc)
+            {
+                printf(" split off assert\n");
+            }
             go.changes++;
             goto L1;
         }
-        b.Belem = bl_delist(list_reverse(bel));
+        b.Belem = bl_delist2(earray);
     }
+    elems.dtor();
 }
 
 } //!SPP