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 3ad467cbff99ca67c4806c817d886d6404f6890b..ccfa977ffae603d6c66038d62060c9e85fe822e0 100644 (file)
--- 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