pghs975uc
/
infer_clone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[sledge][NFC] Rename args to actuals

Browse Source 
Summary: For consistency

Reviewed By: ngorogiannis

Differential Revision: D17801953

fbshipit-source-id: a797d2446
master
Josh Berdine 5 years ago committed by Facebook Github Bot
parent d3d0c4b36e
commit fbf0fe2f1a
4 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File

6
sledge/src/control.ml
Unescape View File

@ -271,7 +271,7 @@ module Make (Dom : Domain_sig.Dom) = struct
let summary_table = Hashtbl.create (module Reg) let summary_table = Hashtbl.create (module Reg)
let exec_call opts stk state block call globals = let exec_call opts stk state block call globals =
let Llair.{callee; args= actuals; areturn; return; recursive} = call in let Llair.{callee; actuals; areturn; return; recursive} = call in
let Llair.{name; formals; freturn; locals; entry} = callee in let Llair.{name; formals; freturn; locals; entry} = callee in
[%Trace.call fun {pf} -> [%Trace.call fun {pf} ->
pf "%a from %a with state %a" Reg.pp name.reg Reg.pp pf "%a from %a with state %a" Reg.pp name.reg Reg.pp
@ -430,7 +430,7 @@ module Make (Dom : Domain_sig.Dom) = struct
with with
| Some state -> exec_jump stk state block jump |> Work.seq x | Some state -> exec_jump stk state block jump |> Work.seq x
| None -> x ) | None -> x )
| Call ({callee; args; areturn; return} as call) -> ( | Call ({callee; actuals; areturn; return} as call) -> (
let lookup name = let lookup name =
Option.to_list (Llair.Func.find pgm.functions name) Option.to_list (Llair.Func.find pgm.functions name)
in in
@ -441,7 +441,7 @@ module Make (Dom : Domain_sig.Dom) = struct
List.fold callees ~init:Work.skip ~f:(fun x callee -> List.fold callees ~init:Work.skip ~f:(fun x callee ->
( match ( match
Dom.exec_intrinsic ~skip_throw:opts.skip_throw state Dom.exec_intrinsic ~skip_throw:opts.skip_throw state
areturn callee.name.reg args areturn callee.name.reg actuals
with with
| Some None -> | Some None ->
Report.invalid_access_term Report.invalid_access_term

33
sledge/src/llair/frontend.ml
Unescape View File

@ -971,8 +971,8 @@ let xlate_instr :
let typ = xlate_type x lltyp in let typ = xlate_type x lltyp in
let lbl = name ^ ".ret" in let lbl = name ^ ".ret" in
let call = let call =
let args = let actuals =
let num_args = let num_actuals =
if not (Llvm.is_var_arg (Llvm.element_type lltyp)) then if not (Llvm.is_var_arg (Llvm.element_type lltyp)) then
Llvm.num_arg_operands instr Llvm.num_arg_operands instr
else else
@ -992,13 +992,13 @@ let xlate_instr :
pp_llvalue instr () ) ; pp_llvalue instr () ) ;
Array.length (Llvm.param_types llfty) Array.length (Llvm.param_types llfty)
in in
List.rev_init num_args ~f:(fun i -> List.rev_init num_actuals ~f:(fun i ->
xlate_value x (Llvm.operand instr i) ) xlate_value x (Llvm.operand instr i) )
in in
let areturn = xlate_name_opt x instr in let areturn = xlate_name_opt x instr in
let return = Llair.Jump.mk lbl in let return = Llair.Jump.mk lbl in
Llair.Term.call ~func ~typ ~args ~areturn ~return ~throw:None Llair.Term.call ~func ~typ ~actuals ~areturn ~return
~loc ~throw:None ~loc
in in
continue (fun (insts, term) -> continue (fun (insts, term) ->
let cmnd = Vector.of_list insts in let cmnd = Vector.of_list insts in
@ -1010,7 +1010,7 @@ let xlate_instr :
let fname = Llvm.value_name llfunc in let fname = Llvm.value_name llfunc in
let return_blk = Llvm.get_normal_dest instr in let return_blk = Llvm.get_normal_dest instr in
let unwind_blk = Llvm.get_unwind_dest instr in let unwind_blk = Llvm.get_unwind_dest instr in
let num_args = let num_actuals =
if not (Llvm.is_var_arg (Llvm.element_type lltyp)) then if not (Llvm.is_var_arg (Llvm.element_type lltyp)) then
Llvm.num_arg_operands instr Llvm.num_arg_operands instr
else ( else (
@ -1022,11 +1022,6 @@ let xlate_instr :
assert (Poly.(Llvm.classify_type lltyp = Pointer)) ; assert (Poly.(Llvm.classify_type lltyp = Pointer)) ;
Array.length (Llvm.param_types (Llvm.element_type lltyp)) ) Array.length (Llvm.param_types (Llvm.element_type lltyp)) )
in in
let args =
List.rev_init num_args ~f:(fun i ->
xlate_value x (Llvm.operand instr i) )
in
let areturn = xlate_name_opt x instr in
(* intrinsics *) (* intrinsics *)
match String.split fname ~on:'.' with match String.split fname ~on:'.' with
| _ when Option.is_some (xlate_intrinsic_exp fname) -> | _ when Option.is_some (xlate_intrinsic_exp fname) ->
@ -1040,7 +1035,7 @@ let xlate_instr :
| ["_Znwm" (* operator new(size_t num) *)] | ["_Znwm" (* operator new(size_t num) *)]
|[ "_ZnwmSt11align_val_t" |[ "_ZnwmSt11align_val_t"
(* operator new(unsigned long num, std::align_val_t) *) ] (* operator new(unsigned long num, std::align_val_t) *) ]
when num_args > 0 -> when num_actuals > 0 ->
let reg = xlate_name x instr in let reg = xlate_name x instr in
let num = xlate_value x (Llvm.operand instr 0) in let num = xlate_value x (Llvm.operand instr 0) in
let len = Exp.size_of (Exp.reg reg) in let len = Exp.size_of (Exp.reg reg) in
@ -1056,11 +1051,17 @@ let xlate_instr :
| _ -> | _ ->
let func = xlate_func_name x llfunc in let func = xlate_func_name x llfunc in
let typ = xlate_type x (Llvm.type_of llfunc) in let typ = xlate_type x (Llvm.type_of llfunc) in
let actuals =
List.rev_init num_actuals ~f:(fun i ->
xlate_value x (Llvm.operand instr i) )
in
let areturn = xlate_name_opt x instr in
let return, blocks = xlate_jump x instr return_blk loc [] in let return, blocks = xlate_jump x instr return_blk loc [] in
let throw, blocks = xlate_jump x instr unwind_blk loc blocks in let throw, blocks = xlate_jump x instr unwind_blk loc blocks in
let throw = Some throw in let throw = Some throw in
emit_term emit_term
(Llair.Term.call ~func ~typ ~args ~areturn ~return ~throw ~loc) (Llair.Term.call ~func ~typ ~actuals ~areturn ~return ~throw
~loc)
~blocks ) ~blocks )
| Ret -> | Ret ->
let exp = let exp =
@ -1146,11 +1147,11 @@ let xlate_instr :
let ti = Exp.reg ti in let ti = Exp.reg ti in
let typeid = xlate_llvm_eh_typeid_for x tip ti in let typeid = xlate_llvm_eh_typeid_for x tip ti in
let lbl = name ^ ".unwind" in let lbl = name ^ ".unwind" in
let param = xlate_name x instr in let reg = xlate_name x instr in
let jump_unwind i sel rev_blocks = let jump_unwind i sel rev_blocks =
let arg = Exp.record exc_typ (Vector.of_array [|exc; sel|]) in let exp = Exp.record exc_typ (Vector.of_array [|exc; sel|]) in
let mov = let mov =
Llair.Inst.move ~reg_exps:(Vector.of_array [|(param, arg)|]) ~loc Llair.Inst.move ~reg_exps:(Vector.of_array [|(reg, exp)|]) ~loc
in in
let lbl = lbl ^ "." ^ Int.to_string i in let lbl = lbl ^ "." ^ Int.to_string i in
let blk = let blk =

27
sledge/src/llair/llair.ml
Unescape View File

@ -30,7 +30,7 @@ type jump = {mutable dst: block; mutable retreating: bool}
and 'a call = and 'a call =
{ callee: 'a { callee: 'a
; typ: Typ.t ; typ: Typ.t
; args: Exp.t list ; actuals: Exp.t list
; areturn: Reg.t option ; areturn: Reg.t option
; return: jump ; return: jump
; throw: jump option ; throw: jump option
@ -81,12 +81,12 @@ let sexp_of_term = function
{key: Exp.t; tbl: (Exp.t * jump) vector; els: jump; loc: Loc.t}] {key: Exp.t; tbl: (Exp.t * jump) vector; els: jump; loc: Loc.t}]
| Iswitch {ptr; tbl; loc} -> | Iswitch {ptr; tbl; loc} ->
sexp_ctor "Iswitch" [%sexp {ptr: Exp.t; tbl: jump vector; loc: Loc.t}] sexp_ctor "Iswitch" [%sexp {ptr: Exp.t; tbl: jump vector; loc: Loc.t}]
| Call {callee; typ; args; areturn; return; throw; recursive; loc} -> | Call {callee; typ; actuals; areturn; return; throw; recursive; loc} ->
sexp_ctor "Call" sexp_ctor "Call"
[%sexp [%sexp
{ callee: Exp.t { callee: Exp.t
; typ: Typ.t ; typ: Typ.t
; args: Exp.t list ; actuals: Exp.t list
; areturn: Reg.t option ; areturn: Reg.t option
; return: jump ; return: jump
; throw: jump option ; throw: jump option
@ -158,8 +158,9 @@ let pp_inst fs inst =
reg msg Loc.pp loc reg msg Loc.pp loc
| Abort {loc} -> pf "@[<2>abort;@]\t%a" Loc.pp loc | Abort {loc} -> pf "@[<2>abort;@]\t%a" Loc.pp loc
let pp_args pp_arg fs args = let pp_actuals pp_actual fs actuals =
Format.fprintf fs "@ (@[%a@])" (List.pp ",@ " pp_arg) (List.rev args) Format.fprintf fs "@ (@[%a@])" (List.pp ",@ " pp_actual)
(List.rev actuals)
let pp_formal fs reg = Reg.pp fs reg let pp_formal fs reg = Reg.pp fs reg
@ -188,12 +189,12 @@ let pp_term fs term =
(Vector.pp "@ " (fun fs jmp -> (Vector.pp "@ " (fun fs jmp ->
Format.fprintf fs "%s: %a" jmp.dst.lbl pp_goto jmp )) Format.fprintf fs "%s: %a" jmp.dst.lbl pp_goto jmp ))
tbl Loc.pp loc tbl Loc.pp loc
| Call {callee; args; areturn; return; throw; recursive; loc; _} -> | Call {callee; actuals; areturn; return; throw; recursive; loc; _} ->
pf "@[<2>@[<7>%acall @[<2>%s%a%a@]@]@ @[returnto %a%a;@]@]\t%a" pf "@[<2>@[<7>%acall @[<2>%s%a%a@]@]@ @[returnto %a%a;@]@]\t%a"
(Option.pp "%a := " Reg.pp) (Option.pp "%a := " Reg.pp)
areturn areturn
(if recursive then "↑" else "") (if recursive then "↑" else "")
Exp.pp callee (pp_args Exp.pp) args pp_jump return Exp.pp callee (pp_actuals Exp.pp) actuals pp_jump return
(Option.pp "@ throwto %a" pp_jump) (Option.pp "@ throwto %a" pp_jump)
throw Loc.pp loc throw Loc.pp loc
| Return {exp; loc} -> | Return {exp; loc} ->
@ -309,10 +310,10 @@ module Term = struct
@@ fun () -> @@ fun () ->
match term with match term with
| Switch _ | Iswitch _ -> assert true | Switch _ | Iswitch _ -> assert true
| Call {typ; args= actls; areturn; _} -> ( | Call {typ; actuals; areturn; _} -> (
match typ with match typ with
| Pointer {elt= Function {args= frmls; return= retn_typ; _}} -> | Pointer {elt= Function {args; return= retn_typ; _}} ->
assert (Vector.length frmls = List.length actls) ; assert (Vector.length args = List.length actuals) ;
assert (Option.is_some retn_typ || Option.is_none areturn) assert (Option.is_some retn_typ || Option.is_none areturn)
| _ -> assert false ) | _ -> assert false )
| Return {exp; _} -> ( | Return {exp; _} -> (
@ -336,11 +337,11 @@ module Term = struct
let iswitch ~ptr ~tbl ~loc = Iswitch {ptr; tbl; loc} |> check invariant let iswitch ~ptr ~tbl ~loc = Iswitch {ptr; tbl; loc} |> check invariant
let call ~func ~typ ~args ~areturn ~return ~throw ~loc = let call ~func ~typ ~actuals ~areturn ~return ~throw ~loc =
Call Call
{ callee= func { callee= func
; typ ; typ
; args ; actuals
; areturn ; areturn
; return ; return
; throw ; throw
@ -408,7 +409,7 @@ module Func = struct
| Pointer {elt= Function {return; _}} -> return | Pointer {elt= Function {return; _}} -> return
| _ -> None ) | _ -> None )
(Option.pp " %a := " Reg.pp) (Option.pp " %a := " Reg.pp)
freturn Global.pp name (pp_args pp_formal) formals freturn Global.pp name (pp_actuals pp_formal) formals
(fun fs -> (fun fs ->
if is_undefined func then Format.fprintf fs " #%i@]" sort_index if is_undefined func then Format.fprintf fs " #%i@]" sort_index
else else

4
sledge/src/llair/llair.mli
Unescape View File

@ -48,7 +48,7 @@ type jump = {mutable dst: block; mutable retreating: bool}
and 'a call = and 'a call =
{ callee: 'a { callee: 'a
; typ: Typ.t (** Type of the callee. *) ; typ: Typ.t (** Type of the callee. *)
; args: Exp.t list (** Stack of arguments, first-arg-last. *) ; actuals: Exp.t list (** Stack of arguments, first-arg-last. *)
; areturn: Reg.t option (** Register to receive return value. *) ; areturn: Reg.t option (** Register to receive return value. *)
; return: jump (** Return destination. *) ; return: jump (** Return destination. *)
; throw: jump option (** Handler destination. *) ; throw: jump option (** Handler destination. *)
@ -153,7 +153,7 @@ module Term : sig
val call : val call :
func:Exp.t func:Exp.t
-> typ:Typ.t -> typ:Typ.t
-> args:Exp.t list -> actuals:Exp.t list
-> areturn:Reg.t option -> areturn:Reg.t option
-> return:jump -> return:jump
-> throw:jump option -> throw:jump option

Write Preview
Loading…
Cancel
Save