* src/vm/jit/replace.c (replace_find_replacement_point_for_pc): Added assertion.

(replace_recover_source_state) [ENABLE_GC_CACAO]: Now recovers native frames.

--HG--
branch : exact-gc

diff --git a/src/vm/jit/replace.c b/src/vm/jit/replace.c
index bea522c330d7da62c31fc44026ba05c55395700c..30ad2bf71126842db95b8043162add820425a39a 100644 (file)
--- a/src/vm/jit/replace.c
+++ b/src/vm/jit/replace.c
@@ -2079,7 +2079,8 @@ rplpoint *replace_find_replacement_point_for_pc(codeinfo *code, u1 *pc)
        s4        i;
 
        DOLOG( printf("searching for rp in %p ", (void*)code);
-                  method_println(code->m); );
+                  method_println(code->m);
+                  printf("PC = %p\n", (void*)pc); );
 
        found = NULL;
 
@@ -2090,6 +2091,8 @@ rplpoint *replace_find_replacement_point_for_pc(codeinfo *code, u1 *pc)
                        found = rp;
        }
 
+       assert(found->pc + found->callsize >= pc);
+
        return found;
 }
 
@@ -2374,7 +2377,9 @@ sourcestate_t *replace_recover_source_state(rplpoint *rp,
 
                                rp = NULL;
 
+#if !defined(ENABLE_GC_CACAO)
                                break; /* XXX remove to activate native frames */
+#endif
                                continue;
                        }