Changeset 820

Timestamp:

12/27/10 06:48:36 (14 years ago)

Author:

walter

Message:

bugzilla 4379 ICE(blockopt.c): foreach over huge tuple, only with -O

Files:

• branches/dmd-1.x/src/backend/blockopt.c (modified) (1 diff)
• trunk/src/backend/blockopt.c (modified) (1 diff)

branches/dmd-1.x/src/backend/blockopt.c

@@ -580 +580 @@
-        block_appendexp(curblock, e);
-        curblock->BC = BCretexp;        // put a return at the end
-    }
-    else
-        curblock->BC = BCret;           // put a return at the end
-    curblock = NULL;                    // undefined from now on
-    block_last = NULL;
-}
-
-
-/******************************
- * Perform branch optimization on basic blocks.
- */
-
-void blockopt(int iter)
-{   block *b;
-    int count;
-
-    if (OPTIMIZER)
-    {
+        int iterationLimit = 200;
+        if (iterationLimit < numblks)
+            iterationLimit = numblks;
-        count = 0;
-        do
-        {
-            //printf("changes = %d, count = %d, dfotop = %d\n",changes,count,dfotop);
-#if MARS
-            util_progress();
-#else
-            if (controlc_saw)
-                util_exit(EXIT_BREAK);
-#endif
-            changes = 0;
-            bropt();                    // branch optimization
-            brrear();                   // branch rearrangement
-            blident();                  // combine identical blocks
-            blreturn();                 // split out return blocks
-            bltailmerge();              // do tail merging
-            brtailrecursion();          // do tail recursion
-            brcombine();                // convert graph to expressions
-            if (iter >= 2)
-                brmin();                // minimize branching
-            do
-            {
-                compdfo();              /* compute depth first order (DFO) */
-                elimblks();             /* remove blocks not in DFO      */
-200
+iterationLimit
-                count++;
-            } while (mergeblks());      /* merge together blocks         */
-        } while (changes);
-#ifdef DEBUG
-        if (debugw)
-            for (b = startblock; b; b = b->Bnext)
-                WRblock(b);
-#endif
-    }
-    else
-    {
-        /* canonicalize the trees        */
-        for (b = startblock; b; b = b->Bnext)
-        {
-#ifdef DEBUG
-            if (debugb)
-                WRblock(b);
-#endif
-            if (b->Belem)
-            {   b->Belem = doptelem(b->Belem,bc_goal[b->BC] | GOALstruct);

trunk/src/backend/blockopt.c

@@ -580 +580 @@
-        block_appendexp(curblock, e);
-        curblock->BC = BCretexp;        // put a return at the end
-    }
-    else
-        curblock->BC = BCret;           // put a return at the end
-    curblock = NULL;                    // undefined from now on
-    block_last = NULL;
-}
-
-
-/******************************
- * Perform branch optimization on basic blocks.
- */
-
-void blockopt(int iter)
-{   block *b;
-    int count;
-
-    if (OPTIMIZER)
-    {
+        int iterationLimit = 200;
+        if (iterationLimit < numblks)
+            iterationLimit = numblks;
-        count = 0;
-        do
-        {
-            //printf("changes = %d, count = %d, dfotop = %d\n",changes,count,dfotop);
-#if MARS
-            util_progress();
-#else
-            if (controlc_saw)
-                util_exit(EXIT_BREAK);
-#endif
-            changes = 0;
-            bropt();                    // branch optimization
-            brrear();                   // branch rearrangement
-            blident();                  // combine identical blocks
-            blreturn();                 // split out return blocks
-            bltailmerge();              // do tail merging
-            brtailrecursion();          // do tail recursion
-            brcombine();                // convert graph to expressions
-            if (iter >= 2)
-                brmin();                // minimize branching
-            do
-            {
-                compdfo();              /* compute depth first order (DFO) */
-                elimblks();             /* remove blocks not in DFO      */
-200
+iterationLimit
-                count++;
-            } while (mergeblks());      /* merge together blocks         */
-        } while (changes);
-#ifdef DEBUG
-        if (debugw)
-            for (b = startblock; b; b = b->Bnext)
-                WRblock(b);
-#endif
-    }
-    else
-    {
-        /* canonicalize the trees        */
-        for (b = startblock; b; b = b->Bnext)
-        {
-#ifdef DEBUG
-            if (debugb)
-                WRblock(b);
-#endif
-            if (b->Belem)
-            {   b->Belem = doptelem(b->Belem,bc_goal[b->BC] | GOALstruct);