From 970b927e56bff69d8e3e949ab0fd4f33ddcc9e44 Mon Sep 17 00:00:00 2001 From: zoltan Date: Wed, 27 Jan 2010 02:48:56 +0000 Subject: [PATCH] 2010-01-27 Zoltan Varga * abcremoval.c (process_block): Fix the if (region) check so abcrem actually works. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@150271 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/mini/ChangeLog | 3 +++ mono/mini/abcremoval.c | 2 +- mono/mini/mini-llvm.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 2f93055b2..021c9aff4 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,8 @@ 2010-01-27 Zoltan Varga + * abcremoval.c (process_block): Fix the if (region) check so abcrem actually + works. + * mini-amd64.c: Make the soft debugger work on platforms without MAP_32BIT. Fixes #573988. diff --git a/mono/mini/abcremoval.c b/mono/mini/abcremoval.c index a130276f7..0e84305fa 100644 --- a/mono/mini/abcremoval.c +++ b/mono/mini/abcremoval.c @@ -1022,7 +1022,7 @@ process_block (MonoCompile *cfg, MonoBasicBlock *bb, MonoVariableRelationsEvalua printf ("\nProcessing block %d [dfn %d]...\n", bb->block_num, bb->dfn); } - if (bb->region) + if (bb->region != -1) return; get_relations_from_previous_bb (area, bb, &additional_relations); diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c index e5f4ff9fe..f6277f5c0 100644 --- a/mono/mini/mini-llvm.c +++ b/mono/mini/mini-llvm.c @@ -970,7 +970,7 @@ emit_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref, LL LLVMBuilderRef builder = *builder_ref; // FIXME: Nested clauses - if (bb->region && MONO_BBLOCK_IS_IN_REGION (bb, MONO_REGION_TRY)) { + if (bb->region != -1 && MONO_BBLOCK_IS_IN_REGION (bb, MONO_REGION_TRY)) { MonoMethodHeader *header = mono_method_get_header (cfg->method); // FIXME: Add a macro for this int clause_index = (bb->region >> 8) - 1; -- 2.11.4.GIT