From: Stephane Glondu <steph@glondu.net>
Date: Thu, 26 Dec 2013 20:56:57 +0000 (+0100)
Subject: Fix lost locations in out-of-bounds exceptions
X-Git-Tag: archive/raspbian/4.02.3-10+rpi1~2^2^2^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef5b350b8813739400ddce764764cb2745d1a0f6;p=ocaml.git

Fix lost locations in out-of-bounds exceptions

Origin: upstream SVN, r14325
Bug: http://caml.inria.fr/mantis/view.php?id=6233

Gbp-Pq: Name 0017-Fix-lost-locations-in-out-of-bounds-exceptions.patch
---

diff --git a/asmcomp/schedgen.ml b/asmcomp/schedgen.ml
index a04ab273..e04eacd3 100644
--- a/asmcomp/schedgen.ml
+++ b/asmcomp/schedgen.ml
@@ -336,9 +336,8 @@ method private reschedule ready_queue date cont =
             if son.emitted_ancestors = son.ancestors then
               new_queue := son :: !new_queue)
           node.sons;
-        instr_cons_debug node.instr.desc node.instr.arg node.instr.res
-        node.instr.dbg
-          (self#reschedule !new_queue (date + issue_cycles) cont)
+        { node.instr with next =
+            self#reschedule !new_queue (date + issue_cycles) cont }
   end
 
 (* Entry point *)