Don't merge an empty block if the address of the block was used.

diff --git a/ChangeLog b/ChangeLog
index 3cb6dde62580a89f848f870a5d01c5da672ddea2..7d5c0a4e47e084360d8086dc02c13d9d36b24f91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-08  Klaus Treichel  <ktreichel@web.de>
+
+       * jit/jit-block.c (_jit_block_clean_cfg): Don't merge an empty block
+       if the block's address was used.
+
 2010-01-24  Klaus Treichel  <ktreichel@web.de>
 
        * jit/jit-insn.c (jit_insn_branch_if, jit_insn_branch_if_not): Fix

diff --git a/jit/jit-block.c b/jit/jit-block.c
index ea4a0bb38fb157f02b83f1e729e1c683eb5c03bb..5c5eda8b7329a2d50274eb2ad1ed6a7b207b3463 100644 (file)
--- a/jit/jit-block.c
+++ b/jit/jit-block.c
@@ -778,7 +778,8 @@ _jit_block_clean_cfg(jit_function_t func)
                   && (block->succs[0]->flags == _JIT_EDGE_BRANCH
                       || block->succs[0]->flags == _JIT_EDGE_FALLTHRU))
                {
-                       if(is_empty_block(block))
+                       if(block->address_of == 0 &&
+                          is_empty_block(block))
                        {
                                /* Remove empty block */
 #ifdef _JIT_BLOCK_DEBUG