commit 7a02cb14a0e6ced63a48e7d1a2a1977df91c49ad
author Ben Cheng <bccheng@android.com> Wed Dec 15 14:18:31 2010 -0800
committer Ben Cheng <bccheng@android.com> Wed Dec 15 14:36:07 2010 -0800
tree 67d9c3524fe602af77f4d6557a1f150bf6e145de
parent 637dcadf049c3a15d87292e189600036750f2d38

Store the key value with switch and catch blocks.

For switch blocks, the key is the enum value with the case.
For catch blocks, the key is the type id of the exception.

Change-Id: I66a7e31c917aba63a0b455ce1796e3d5e277ca5a

vm/compiler/MethodSSATransformation.c

diff --git a/vm/compiler/MethodSSATransformation.c b/vm/compiler/MethodSSATransformation.c
index fc56891..48d5b5c 100644
--- a/vm/compiler/MethodSSATransformation.c
+++ b/vm/compiler/MethodSSATransformation.c
@@ -36,9 +36,10 @@
         dvmGrowableListIteratorInit(&block->successorBlockList.blocks,
                                     &iterator);
         while (true) {
-            BasicBlock *succBB =
-                (BasicBlock *) dvmGrowableListIteratorNext(&iterator);
-            if (succBB == NULL) break;
+            SuccessorBlockInfo *successorBlockInfo =
+                (SuccessorBlockInfo *) dvmGrowableListIteratorNext(&iterator);
+            if (successorBlockInfo == NULL) break;
+            BasicBlock *succBB = successorBlockInfo->block;
             recordDFSPreOrder(cUnit, succBB);
         }
     }
@@ -154,9 +155,10 @@
         dvmGrowableListIteratorInit(&bb->successorBlockList.blocks,
                                     &iterator);
         while (true) {
-            BasicBlock *succBB =
-                (BasicBlock *) dvmGrowableListIteratorNext(&iterator);
-            if (succBB == NULL) break;
+            SuccessorBlockInfo *successorBlockInfo =
+                (SuccessorBlockInfo *) dvmGrowableListIteratorNext(&iterator);
+            if (successorBlockInfo == NULL) break;
+            BasicBlock *succBB = successorBlockInfo->block;
             if (!dvmIsBitSet(succBB->dominators, bb->id)) {
                 dvmSetBit(bb->domFrontier, succBB->id);
             }
@@ -373,9 +375,10 @@
         dvmGrowableListIteratorInit(&bb->successorBlockList.blocks,
                                     &iterator);
         while (true) {
-            BasicBlock *succBB =
-                (BasicBlock *) dvmGrowableListIteratorNext(&iterator);
-            if (succBB == NULL) break;
+            SuccessorBlockInfo *successorBlockInfo =
+                (SuccessorBlockInfo *) dvmGrowableListIteratorNext(&iterator);
+            if (successorBlockInfo == NULL) break;
+            BasicBlock *succBB = successorBlockInfo->block;
             if (succBB->dataFlowInfo) {
                 computeSuccLiveIn(tempDalvikRegisterV,
                                   succBB->dataFlowInfo->liveInV,