merging poly_meth2poly_meth2

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/poly_meth2@4692 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 3 insertions, 3 deletions

diff --git a/byterun/interp.c b/byterun/interp.c
index 599218e487..aed6c053f5 100644
--- a/byterun/interp.c
+++ b/byterun/interp.c
@@ -790,13 +790,13 @@ value interprete(code_t prog, asize_t prog_size)
     raise_exception:
       if (trapsp >= trap_barrier) debugger(TRAP_BARRIER);
       if (backtrace_active) stash_backtrace(accu, pc, sp);
-      sp = trapsp;
-      if ((char *) sp >= (char *) stack_high - initial_sp_offset) {
+      if ((char *) trapsp >= (char *) stack_high - initial_sp_offset) {
         external_raise = initial_external_raise;
-        extern_sp = sp;
+        extern_sp = (value *) ((char *) stack_high - initial_sp_offset);
         callback_depth--;
         return Make_exception_result(accu);
       }
+      sp = trapsp;
       pc = Trap_pc(sp);
       trapsp = Trap_link(sp);
       env = sp[2];