From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Thu, 28 Nov 2013 14:31:42 +0000 (+0000)
Subject: Make "ocamlopt -g" more resistant to ill-formed locations
X-Git-Tag: archive/raspbian/4.02.3-10+rpi1~2^2^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24995c4eba01830393a85463f66a80e21efeb0da;p=ocaml.git

Make "ocamlopt -g" more resistant to ill-formed locations

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

Gbp-Pq: Name 0016-Make-ocamlopt-g-more-resistant-to-ill-formed-locatio.patch
---

diff --git a/asmcomp/emitaux.ml b/asmcomp/emitaux.ml
index 3ad467cb..ccfa977f 100644
--- a/asmcomp/emitaux.ml
+++ b/asmcomp/emitaux.ml
@@ -221,9 +221,9 @@ let reset_debug_info () =
 let emit_debug_info dbg =
   if is_cfi_enabled () &&
     (!Clflags.debug || Config.with_frame_pointers)
-     && not (Debuginfo.is_none dbg) then begin
+     && dbg.Debuginfo.dinfo_line > 0 (* PR#6243 *)
+  then begin
     let line = dbg.Debuginfo.dinfo_line in
-    assert (line <> 0); (* clang errors out on zero line numbers *)
     let file_name = dbg.Debuginfo.dinfo_file in
     let file_num =
       try List.assoc file_name !file_pos_nums