2009-02-12 Zoltan Varga <vargaz@gmail.com>

	* ssa.c (fold_ins): Use MONO_IS_JUMP_TABLE () and MONO_JUMP_TABLE_FROM_INS ()
	for processing jump tables. Fixes #473787.

svn path=/trunk/mono/; revision=126668

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 2b7f65b9eb1e82e4d2809e0d07dd9b9990a03d41..c2b4c0258f21315830ad9c9d29f83cbe7f8fc3a8 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-12  Zoltan Varga  <vargaz@gmail.com>
+
+       * ssa.c (fold_ins): Use MONO_IS_JUMP_TABLE () and MONO_JUMP_TABLE_FROM_INS ()
+       for processing jump tables. Fixes #473787.
+
 2009-02-11  Mark Probst  <mark.probst@gmail.com>
 
        * mini-generic-sharing.c: mini_method_get_context() just calls

diff --git a/mono/mini/ssa.c b/mono/mini/ssa.c
index e491377f903c74b9175218c4fe92cd9725c8e7a7..fc3986aad2212cce6087ca24933cb4bae0a053f1 100644 (file)
--- a/mono/mini/ssa.c
+++ b/mono/mini/ssa.c
@@ -983,9 +983,9 @@ visit_inst (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, GList **cvars,
                        }
                }
 
-               if (ins->opcode == OP_JUMP_TABLE) {
+               if (MONO_IS_JUMP_TABLE (ins)) {
                        int i;
-                       MonoJumpInfoBBTable *table = ins->inst_p0;
+                       MonoJumpInfoBBTable *table = MONO_JUMP_TABLE_FROM_INS (ins);
 
                        if (ins->next->opcode != OP_PADD) {
                                /* The PADD was optimized away */
@@ -1093,9 +1093,9 @@ fold_ins (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, MonoInst **carray
                        }
                }
 
-               if (ins->opcode == OP_JUMP_TABLE) {
+               if (MONO_IS_JUMP_TABLE (ins)) {
                        int i;
-                       MonoJumpInfoBBTable *table = ins->inst_p0;
+                       MonoJumpInfoBBTable *table = MONO_JUMP_TABLE_FROM_INS (ins);
 
                        if (ins->next->opcode != OP_PADD) {
                                /* The PADD was optimized away */