Fix lost locations in out-of-bounds exceptions

diff --git a/debian/patches/0017-Fix-lost-locations-in-out-of-bounds-exceptions.patch b/debian/patches/0017-Fix-lost-locations-in-out-of-bounds-exceptions.patch
new file mode 100644 (file)
index 0000000..5611abe
--- /dev/null
+++ b/debian/patches/0017-Fix-lost-locations-in-out-of-bounds-exceptions.patch
@@ -0,0 +1,27 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Thu, 26 Dec 2013 21:56:57 +0100
+Subject: Fix lost locations in out-of-bounds exceptions
+
+Origin: upstream SVN, r14325
+Bug: http://caml.inria.fr/mantis/view.php?id=6233
+---
+ asmcomp/schedgen.ml | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/asmcomp/schedgen.ml b/asmcomp/schedgen.ml
+index a04ab27..e04eacd 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 *)
+-- 

diff --git a/debian/patches/series b/debian/patches/series
index 074c6c0034e8e204302e41f31e662ff4a8cd1ad7..f0bb547898151de820997bdc382b600d9e6448d2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 0014-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch
 0015-Fix-native-backtraces-on-arm.patch
 0016-Make-ocamlopt-g-more-resistant-to-ill-formed-locatio.patch
+0017-Fix-lost-locations-in-out-of-bounds-exceptions.patch