[sledge][NFC] Rename Term.call's func arg to callee to match type

Summary: Just for consistency

Reviewed By: bennostein

Differential Revision: D17821846

fbshipit-source-id: 778c61a56
master
Josh Berdine 5 years ago committed by Facebook Github Bot
parent 6399c59861
commit bc858fad2e

@ -985,7 +985,7 @@ let xlate_instr :
skip "inline asm" skip "inline asm"
(* general function call that may not throw *) (* general function call that may not throw *)
| _ -> | _ ->
let func = xlate_func_name x llfunc in let callee = xlate_func_name x llfunc in
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 =
@ -1000,7 +1000,7 @@ let xlate_instr :
warn warn
"ignoring variable arguments to variadic \ "ignoring variable arguments to variadic \
function: %a" function: %a"
Exp.pp func () Exp.pp callee ()
| _ -> () ) ; | _ -> () ) ;
let llfty = Llvm.element_type lltyp in let llfty = Llvm.element_type lltyp in
( match Llvm.classify_type llfty with ( match Llvm.classify_type llfty with
@ -1015,7 +1015,7 @@ let xlate_instr :
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 ~actuals ~areturn ~return Llair.Term.call ~callee ~typ ~actuals ~areturn ~return
~throw:None ~loc ~throw:None ~loc
in in
continue (fun (insts, term) -> continue (fun (insts, term) ->
@ -1067,7 +1067,7 @@ let xlate_instr :
todo "statepoints:@ %a" pp_llvalue instr () todo "statepoints:@ %a" pp_llvalue instr ()
(* general function call that may throw *) (* general function call that may throw *)
| _ -> | _ ->
let func = xlate_func_name x llfunc in let callee = 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 = let actuals =
List.rev_init num_actuals ~f:(fun i -> List.rev_init num_actuals ~f:(fun i ->
@ -1078,7 +1078,7 @@ let xlate_instr :
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 ~actuals ~areturn ~return ~throw (Llair.Term.call ~callee ~typ ~actuals ~areturn ~return ~throw
~loc) ~loc)
~blocks ) ~blocks )
| Ret -> | Ret ->

@ -329,16 +329,9 @@ 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 ~actuals ~areturn ~return ~throw ~loc = let call ~callee ~typ ~actuals ~areturn ~return ~throw ~loc =
Call Call
{ callee= func {callee; typ; actuals; areturn; return; throw; recursive= false; loc}
; typ
; actuals
; areturn
; return
; throw
; recursive= false
; loc }
|> check invariant |> check invariant
let return ~exp ~loc = Return {exp; loc} |> check invariant let return ~exp ~loc = Return {exp; loc} |> check invariant

@ -148,7 +148,7 @@ module Term : sig
val iswitch : ptr:Exp.t -> tbl:jump vector -> loc:Loc.t -> term val iswitch : ptr:Exp.t -> tbl:jump vector -> loc:Loc.t -> term
val call : val call :
func:Exp.t callee:Exp.t
-> typ:Typ.t -> typ:Typ.t
-> actuals:Exp.t list -> actuals:Exp.t list
-> areturn:Reg.t option -> areturn:Reg.t option

Loading…
Cancel
Save