Relax the restrictions on the encoding of destinations (#1578)

Author: bmourad01

lib/bap_disasm/bap_disasm_driver.ml

@@ -383,19 +383,20 @@ let merge_encodings x y =
   | Ok coding -> KB.return {x with coding}
   | Error mismatch -> KB.fail mismatch
 
+let is_known {coding} = not (Theory.Language.is_unknown coding)
 
 let collect_dests source code =
   KB.collect Theory.Semantics.slot code >>= fun insn ->
   let init = {
-    encoding=source;
+    encoding={source with coding = Theory.Language.unknown};
     call = Insn.(is call insn);
     barrier = Insn.(is barrier insn);
     indirect = false;
     resolved = Set.empty (module Addr);
     unresolved = Set.empty (module Theory.Label);
   } in
   KB.Value.get Insn.Slot.dests insn |> function
-  | None -> KB.return init
+  | None -> KB.return {init with encoding = source}
   | Some dests ->
     Set.to_sequence dests |>
     KB.Seq.fold ~init ~f:(fun dest label ->
@@ -417,7 +418,9 @@ let collect_dests source code =
             indirect=true;
             unresolved = Set.add dest.unresolved label;
             encoding;
-          })
+          }) >>| fun dest ->
+    if is_known dest.encoding then dest
+    else {dest with encoding = source}
 
 let pp_addr_opt ppf = function
   | None -> Format.fprintf ppf "Unk"
@@ -463,8 +466,6 @@ let switch encoding s =
   | Error _ -> s
   | Ok dis -> Dis.switch s dis
 
-let is_known {coding} = not (Theory.Language.is_unknown coding)
-
 let disassemble ~code ~data ~funs debt base : Machine.state KB.t =
   unit_for_mem base >>= fun unit ->
   let rec next_encoding state current mem f =