[refactor] Remove redundant calls

Reviewed By: jvillard

Differential Revision: D28540798

fbshipit-source-id: 5d86649e5
master
Ezgi Çiçek 4 years ago committed by Facebook GitHub Bot
parent 291d250b9b
commit ab7d569e50

@ -1077,8 +1077,6 @@ module JavaCollection = struct
astate |> ok_continue astate |> ok_continue
let add_at ~desc coll _ new_elem : model = add ~desc coll new_elem
let update coll new_val new_val_hist event location ret_id astate = let update coll new_val new_val_hist event location ret_id astate =
(* case0: element not present in collection *) (* case0: element not present in collection *)
let* astate, coll_val = PulseOperations.eval_access Read location coll Dereference astate in let* astate, coll_val = PulseOperations.eval_access Read location coll Dereference astate in
@ -1101,7 +1099,7 @@ module JavaCollection = struct
[astate; astate1; astate2] [astate; astate1; astate2]
let set coll _ (new_val, new_val_hist) : model = let set coll (new_val, new_val_hist) : model =
fun {location; ret= ret_id, _} astate -> fun {location; ret= ret_id, _} astate ->
let event = ValueHistory.Call {f= Model "Collection.set()"; location; in_call= []} in let event = ValueHistory.Call {f= Model "Collection.set()"; location; in_call= []} in
let<*> astates = update coll new_val new_val_hist event location ret_id astate in let<*> astates = update coll new_val new_val_hist event location ret_id astate in
@ -1618,8 +1616,8 @@ module ProcNameDispatcher = struct
&:: "add" <>$ capt_arg_payload $+ capt_arg_payload &:: "add" <>$ capt_arg_payload $+ capt_arg_payload
$--> JavaCollection.add ~desc:"Collection.add" $--> JavaCollection.add ~desc:"Collection.add"
; +map_context_tenv PatternMatch.Java.implements_list ; +map_context_tenv PatternMatch.Java.implements_list
&:: "add" <>$ capt_arg_payload $+ capt_arg_payload $+ capt_arg_payload &:: "add" <>$ capt_arg_payload $+ any_arg $+ capt_arg_payload
$--> JavaCollection.add_at ~desc:"Collection.add()" $--> JavaCollection.add ~desc:"Collection.add()"
; +map_context_tenv PatternMatch.Java.implements_collection ; +map_context_tenv PatternMatch.Java.implements_collection
&:: "remove" &:: "remove"
&++> JavaCollection.remove ~desc:"Collection.remove" &++> JavaCollection.remove ~desc:"Collection.remove"
@ -1682,8 +1680,6 @@ module ProcNameDispatcher = struct
; +map_context_tenv PatternMatch.Java.implements_iterator ; +map_context_tenv PatternMatch.Java.implements_iterator
&:: "remove" <>$ capt_arg_payload &:: "remove" <>$ capt_arg_payload
$+...$--> JavaIterator.remove ~desc:"remove" $+...$--> JavaIterator.remove ~desc:"remove"
; +map_context_tenv PatternMatch.Java.implements_map
&:: "put" <>$ capt_arg_payload $+...$--> StdVector.push_back
; +map_context_tenv PatternMatch.Java.implements_map ; +map_context_tenv PatternMatch.Java.implements_map
&:: "putAll" <>$ capt_arg_payload $+...$--> StdVector.push_back &:: "putAll" <>$ capt_arg_payload $+...$--> StdVector.push_back
; -"std" &:: "vector" &:: "reserve" <>$ capt_arg_payload $+...$--> StdVector.reserve ; -"std" &:: "vector" &:: "reserve" <>$ capt_arg_payload $+...$--> StdVector.reserve
@ -1691,8 +1687,7 @@ module ProcNameDispatcher = struct
&:: "get" <>$ capt_arg_payload $+ capt_arg_payload &:: "get" <>$ capt_arg_payload $+ capt_arg_payload
$--> StdVector.at ~desc:"Collection.get()" $--> StdVector.at ~desc:"Collection.get()"
; +map_context_tenv PatternMatch.Java.implements_list ; +map_context_tenv PatternMatch.Java.implements_list
&:: "set" <>$ capt_arg_payload $+ capt_arg_payload $+ capt_arg_payload &:: "set" <>$ capt_arg_payload $+ any_arg $+ capt_arg_payload $--> JavaCollection.set
$--> JavaCollection.set
; +map_context_tenv PatternMatch.Java.implements_iterator ; +map_context_tenv PatternMatch.Java.implements_iterator
&:: "hasNext" &:: "hasNext"
&--> Misc.nondet ~fn_name:"Iterator.hasNext()" &--> Misc.nondet ~fn_name:"Iterator.hasNext()"

Loading…
Cancel
Save