flambda-backend: DWARF inlined frames support (#1754)

Author: mshinwell

utils/compilation_unit.ml

@@ -245,13 +245,14 @@ let create_child parent name_ =
 
 let of_string str =
   let for_pack_prefix, name =
-    match String.rindex_opt str '.' with
-    | None -> Prefix.empty, Name.of_string str
-    | Some 0 ->
-      (* See [Name.check_as_path_component]; this allows ".cinaps" as a
-         compilation unit *)
-      Prefix.empty, Name.of_string str
-    | Some _ -> Misc.fatal_errorf "[of_string] does not parse qualified names"
+    (* Also see [Name.check_as_path_component] *)
+    if String.equal str ".cinaps" || String.equal str "(.cinaps)"
+    then Prefix.empty, Name.of_string str
+    else
+      match String.rindex_opt str '.' with
+      | None -> Prefix.empty, Name.of_string str
+      | Some _ ->
+        Misc.fatal_errorf "[of_string] does not parse qualified names: %s" str
   in
   create for_pack_prefix name
 

utils/misc.ml

@@ -1443,3 +1443,24 @@ end
 module type T4 = sig
   type ('a, 'b, 'c, 'd) t
 end
+
+let remove_double_underscores s =
+  let len = String.length s in
+  let buf = Buffer.create len in
+  let skip = ref false in
+  let rec loop i =
+    if i < len
+    then (
+      let c = String.get s i in
+      if c = '.' then skip := true;
+      if (not !skip) && c = '_' && i + 1 < len && String.get s (i + 1) = '_'
+      then (
+        Buffer.add_char buf '.';
+        skip := true;
+        loop (i + 2))
+      else (
+        Buffer.add_char buf c;
+        loop (i + 1)))
+  in
+  loop 0;
+  Buffer.contents buf

utils/misc.mli

@@ -895,3 +895,5 @@ end
 type filepath = string
 
 type alerts = string Stdlib.String.Map.t
+
+val remove_double_underscores : string -> string