QWE

Author: hhugo

compiler/lib/flow.ml

@@ -516,15 +516,17 @@ let the_shape_of ~return_values ~pure info x =
                     Shape.Function { arity; pure; res = Top "unk" }
                   with _ -> Top "other")
               | Expr (Apply { f; args; _ }) -> (
-                  match loop info f (Var.Set.add f acc) with
+                let shape = loop info f (Var.Set.add f acc) in
+                let rec loop n' shape =
+                  match shape with
                   | Shape.Function { arity = n; pure; res } ->
-                      let diff = n - List.length args in
-                      if diff > 0
-                      then Shape.Function { arity = diff; pure; res }
-                      else if diff = 0
-                      then res
-                      else Shape.Top "apply"
-                  | Shape.Block _ | Shape.Top _ -> Shape.Top "apply2")
+                      if n = n' then res
+                      else if n' < n
+                      then Shape.Function { arity = n - n'; pure; res }
+                      else loop (n' - n) res
+                  | Shape.Block _ | Shape.Top _ -> Shape.Top "apply2"
+                in
+                loop (List.length args) shape)
               | _ -> Shape.Top "other"))
         (Top "init")
         (fun u v -> merge u v)

compiler/lib/shape.ml

@@ -149,10 +149,12 @@ module State = struct
     | Some (Top _ | Function _) -> ()
     | Some (Block l) -> assign target (List.nth l offset)
 
-  let get x = Code.Var.Hashtbl.find_opt t.table x
-
   let mem x = BitSet.mem t.cache (Code.Var.idx x)
 
+  let get x = if mem x then Code.Var.Hashtbl.find_opt t.table x
+              else None
+
+
   let is_pure_fun x =
     match Code.Var.Hashtbl.find_opt t.table x with
     | None -> false