Skip to content

unifies name generation for IR subroutines #1475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivg merged 1 commit into from
Apr 25, 2022
Merged

unifies name generation for IR subroutines #1475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/bap_types/bap_ir.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@ module Ir_blk = struct
let (++) = Set.union and (--) = Set.diff in
let init = Bap_var.Set.empty,Bap_var.Set.empty in
fst @@ Seq.fold (elts blk) ~init ~f:(fun (vars,kill) -> function
| `Phi phi -> vars, kill
| `Phi _ -> vars, kill
| `Def def ->
Ir_def.free_vars def -- kill ++ vars,
Set.add kill (Ir_def.lhs def)
Expand Down Expand Up @@ -1731,14 +1731,16 @@ end
module Ir_sub = struct
type t = sub term

let new_empty ?(tid=Tid.create ()) ?name () : t =
let name = match name with
let make_name ?name tid =
match name with
| Some name -> name
| None -> match Tid.get_name tid with
| None -> Tid.to_string tid
| Some name -> name
| None -> match Tid.get_name tid with
| None -> Tid.to_string tid
| Some name -> name in

let new_empty ?(tid=Tid.create ()) ?name () : t =
make_term tid {
name;
name = make_name ?name tid;
args = [| |] ;
blks = [| |] ;
}
Expand Down Expand Up @@ -1872,9 +1874,7 @@ module Ir_sub = struct
| None -> Tid.create () in
let args = Vec.to_array args in
let blks = Vec.to_array blks in
let name = match name with
| Some name -> name
| None -> Format.asprintf "sub_%a" Tid.pp tid in
let name = make_name ?name tid in
make_term tid {name; args; blks}
end

Expand Down