[sledge] Fix potential divergence in Llair.sexp_of functions

Summary:
It is (now?) the case that `[%sexp_of: type_name]` generates just
`sexp_of_type_name`, rather than expanding `type_name` to its
definition and generating a conversion function for that. Hence, when
such cases appear within `let rec sexp_of_type_name`, they get
captured, sometimes leading to divergence.

This diff fixes this by manually expanding such types into their
definitions.

Reviewed By: ngorogiannis

Differential Revision: D15314736

fbshipit-source-id: 716fff7cc

sledge/src/llair/llair.ml

@@ -57,14 +57,38 @@ and cfg = block vector
    cfg, and it cannot be jumped to, only called. *)
 and func = {name: Global.t; entry: block; cfg: cfg}
 
-let rec sexp_of_jump ({dst; args; retreating} as jmp) =
+let sexp_cons (hd : Sexp.t) (tl : Sexp.t) =
-  if retreating then
+  match tl with
-    [%sexp {dst: label = dst.lbl; args: Exp.t list; retreating: bool}]
+  | List xs -> Sexp.List (hd :: xs)
-  else [%sexp_of: jump] jmp
+  | Atom _ -> Sexp.List [hd; tl]
 
-and sexp_of_term t = [%sexp_of: term] t
+let sexp_ctor label args = sexp_cons (Sexp.Atom label) args
 
-and sexp_of_block {lbl; params; locals; cmnd; term; parent; sort_index} =
+let sexp_of_jump {dst; args; retreating} =
+  [%sexp {dst: label = dst.lbl; args: Exp.t list; retreating: bool}]
+
+let sexp_of_term = function
+  | Switch {key; tbl; els; loc} ->
+      sexp_ctor "Switch"
+        [%sexp
+          {key: Exp.t; tbl: (Exp.t * jump) vector; els: jump; loc: Loc.t}]
+  | Iswitch {ptr; tbl; loc} ->
+      sexp_ctor "Iswitch" [%sexp {ptr: Exp.t; tbl: jump vector; loc: Loc.t}]
+  | Call {call; typ; return; throw; ignore_result; loc} ->
+      sexp_ctor "Call"
+        [%sexp
+          { call: Exp.t control_transfer
+          ; typ: Typ.t
+          ; return: jump
+          ; throw: jump option
+          ; ignore_result: bool
+          ; loc: Loc.t }]
+  | Return {exp; loc} ->
+      sexp_ctor "Return" [%sexp {exp: Exp.t option; loc: Loc.t}]
+  | Throw {exc; loc} -> sexp_ctor "Throw" [%sexp {exc: Exp.t; loc: Loc.t}]
+  | Unreachable -> Sexp.Atom "Unreachable"
+
+let sexp_of_block {lbl; params; locals; cmnd; term; parent; sort_index} =
   [%sexp
     { lbl: label
     ; params: Var.t list
@@ -74,7 +98,10 @@ and sexp_of_block {lbl; params; locals; cmnd; term; parent; sort_index} =
     ; parent: Var.t = parent.name.var
     ; sort_index: int }]
 
-and sexp_of_func f = [%sexp_of: func] f
+let sexp_of_cfg v = [%sexp_of: block vector] v
+
+let sexp_of_func {name; entry; cfg} =
+  [%sexp {name: Global.t; entry: block; cfg: cfg}]
 
 (* blocks in a [t] are uniquely identified by [sort_index] *)
 let compare_block x y = Int.compare x.sort_index y.sort_index