Wasm source maps: do not rewrite paths twice

This is already done when writing the source map.

Author: vouillon

compiler/lib-wasm/link.ml

@@ -589,15 +589,7 @@ let extract_source_map ~dir ~name z =
   then (
     let sm = Source_map.of_string (Zip.read_entry z ~name:"source_map.map") in
     let sm =
-      let rewrite_path path =
-        if Filename.is_relative path
-        then path
-        else
-          match Build_path_prefix_map.get_build_path_prefix_map () with
-          | Some map -> Build_path_prefix_map.rewrite map path
-          | None -> path
-      in
-      Wasm_source_map.insert_source_contents ~rewrite_path sm (fun i j file ->
+      Wasm_source_map.insert_source_contents sm (fun i j file ->
           let name = source_name i j file in
           if Zip.has_entry z ~name then Some (Zip.read_entry z ~name) else None)
     in

compiler/lib-wasm/wasm_source_map.ml

@@ -137,7 +137,7 @@ let blackbox_filename = "/builtin/blackbox.ml"
 
 let blackbox_contents = "(* generated code *)"
 
-let insert_source_contents' ~rewrite_path (sm : Source_map.Standard.t) i f =
+let insert_source_contents' (sm : Source_map.Standard.t) i f =
   let l = sm.sources in
   let single = List.length l = 1 in
   let contents =
@@ -157,13 +157,11 @@ let insert_source_contents' ~rewrite_path (sm : Source_map.Standard.t) i f =
     then { sm with ignore_list = [ blackbox_filename ] }
     else sm
   in
-  let sm = { sm with sources = List.map ~f:rewrite_path sm.sources } in
   sm
 
-let insert_source_contents ~rewrite_path sm f =
+let insert_source_contents sm f =
   match sm with
-  | Source_map.Standard sm ->
-      Source_map.Standard (insert_source_contents' ~rewrite_path sm None f)
+  | Source_map.Standard sm -> Source_map.Standard (insert_source_contents' sm None f)
   | Index ({ sections; _ } as sm) ->
       let single_map = List.length sections = 1 in
       let sections =
@@ -172,7 +170,6 @@ let insert_source_contents ~rewrite_path sm f =
             { entry with
               Source_map.Index.map =
                 insert_source_contents'
-                  ~rewrite_path
                   entry.Source_map.Index.map
                   (if single_map then None else Some i)
                   f

compiler/lib-wasm/wasm_source_map.mli

@@ -33,10 +33,7 @@ val concatenate : (int * Source_map.Standard.t) list -> Source_map.t
 val iter_sources : Source_map.t -> (int option -> int option -> string -> unit) -> unit
 
 val insert_source_contents :
-     rewrite_path:(string -> string)
-  -> Source_map.t
-  -> (int option -> int option -> string -> string option)
-  -> Source_map.t
+  Source_map.t -> (int option -> int option -> string -> string option) -> Source_map.t
 
 val blackbox_filename : string