Wasm source map resizing: clean-up

Author: vouillon

compiler/lib-wasm/wasm_source_map.ml

@@ -14,16 +14,16 @@ type input = Vlq64.input =
   ; len : int
   }
 
-let rec next' src mappings pos =
-  pos < src.len
+let rec next' src mappings pos len =
+  pos < len
   &&
   match mappings.[pos] with
   | ',' ->
       src.pos <- pos + 1;
       true
-  | _ -> next' src mappings (pos + 1)
+  | _ -> next' src mappings (pos + 1) len
 
-let next src = next' src src.string src.pos
+let next src = next' src src.string src.pos src.len
 
 let flush buf src start pos =
   if start < pos then Buffer.add_substring buf src.string start (pos - start)
@@ -36,7 +36,7 @@ let rec resize_rec buf start src resize_data i col0 delta0 col =
   then
     if next src
     then resize_rec buf start src resize_data i col0 delta0 col
-    else flush buf src start (String.length src.string)
+    else flush buf src start src.len
   else
     let delta = delta + delta0 in
     adjust buf start src resize_data i col delta pos
@@ -54,15 +54,15 @@ and adjust buf start src (resize_data : resize_data) i col delta pos =
       let start = src.pos in
       if next src
       then resize_rec buf start src resize_data (i + 1) col0 delta0 col
-      else flush buf src start (String.length src.string))
+      else flush buf src start src.len)
     else
       let delta = delta + delta0 in
       adjust buf start src resize_data (i + 1) col delta pos
   else (
     flush buf src start pos;
     Vlq64.encode buf delta;
     let start = src.pos in
-    flush buf src start (String.length src.string))
+    flush buf src start src.len)
 
 let resize_mappings (resize_data : resize_data) mappings =
   if String.equal mappings "" || resize_data.i = 0

compiler/lib/vlq64.ml

@@ -106,14 +106,15 @@ type input =
   ; len : int
   }
 
-let rec decode' src s pos offset i =
+let rec decode' src s pos len offset i =
+  if pos = len then invalid_arg "Vql64.decode'";
   let digit = Array.unsafe_get code_rev (Char.code s.[pos]) in
   if digit = -1 then invalid_arg "Vql64.decode'";
   let i = i + ((digit land vlq_base_mask) lsl offset) in
   if digit >= vlq_continuation_bit
-  then decode' src s (pos + 1) (offset + vlq_base_shift) i
+  then decode' src s (pos + 1) len (offset + vlq_base_shift) i
   else (
     src.pos <- pos + 1;
     i)
 
-let decode src = fromVLQSigned (decode' src src.string src.pos 0 0)
+let decode src = fromVLQSigned (decode' src src.string src.pos src.len 0 0)