[sledge] Fix bug in Term.solve

Summary:
Term.solve makes the assumption that all distinct normalized constants
denote distinct values. This is fragile at best, and it is better to
enumerate the cases where solve discovers inconsistency.

Reviewed By: jvillard

Differential Revision: D18459619

fbshipit-source-id: 71f52557c

sledge/src/llair/term.ml

@@ -1034,16 +1034,17 @@ let solve e f =
   ;
   let rec solve_ e f s =
     let solve_uninterp e f =
-      let ord = compare e f in
+      match (e, f) with
+      | Integer {data= m}, Integer {data= n} when not (Z.equal m n) -> None
+      | _ -> (
         match (is_constant e, is_constant f) with
-      | true, true when ord <> 0 -> None
-      (* orient equation to discretionarily prefer term that is constant or
-         compares smaller as class representative *)
+        (* orient equation to discretionarily prefer term that is constant
+           or compares smaller as class representative *)
         | true, false -> Some (Map.add_exn s ~key:f ~data:e)
         | false, true -> Some (Map.add_exn s ~key:e ~data:f)
         | _ ->
-          let key, data = if ord > 0 then (e, f) else (f, e) in
-          Some (Map.add_exn s ~key ~data)
+            let key, data = if compare e f > 0 then (e, f) else (f, e) in
+            Some (Map.add_exn s ~key ~data) )
     in
     let concat_size args =
       Vector.fold_until args ~init:zero