2007-06-05 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / branch-opts.c

diff --git a/mono/mini/branch-opts.c b/mono/mini/branch-opts.c
index f57180b61e4d4bb8a0459ac8628e088cd5033dcd..5d01e03ad6800a9fd8284efb992124cb05e6d61a 100644 (file)
--- a/mono/mini/branch-opts.c
+++ b/mono/mini/branch-opts.c
@@ -43,7 +43,7 @@ mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, con
                                 * Flag is set during method_to_ir due to 
                                 * pop-op is optmized away in codegen (burg).
                                 */
-                               tbb = g_hash_table_lookup (cfg->bb_hash, header->code + clause->handler_offset);
+                               tbb = cfg->cil_offset_to_bb [clause->handler_offset];
                                if (tbb && tbb->flags & BB_EXCEPTION_DEAD_OBJ && !(tbb->flags & BB_EXCEPTION_UNSAFE)) {
                                        MonoBasicBlock *targetbb = tbb;
                                        gboolean unsafe = FALSE;
@@ -68,7 +68,7 @@ mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, con
                                                /* Create dummy inst to allow easier integration in
                                                 * arch dependent code (opcode ignored)
                                                 */
-                                               MONO_INST_NEW (cfg, jump, CEE_BR);
+                                               MONO_INST_NEW (cfg, jump, OP_BR);
 
                                                /* Allocate memory for our branch target */
                                                jump->inst_i1 = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst));