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

[pulse] no need to keep location information in `PulseInvalidation.t` anymore

Browse Source 
Summary:
This isn't needed now that this information is recorded in
`PulseTrace.action` instead.

Reviewed By: mbouaziz

Differential Revision: D14645089

fbshipit-source-id: 9c3f38722
master
Jules Villard 6 years ago committed by Facebook Github Bot
parent 3ce095a288
commit d03271d318
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
infer/src/pulse/Pulse.ml
Unescape View File

@ -159,7 +159,7 @@ module PulseTransferFunctions = struct
(* invalidate both [&x] and [x]: reading either is now forbidden *) (* invalidate both [&x] and [x]: reading either is now forbidden *)
let invalidate access_expr = let invalidate access_expr =
PulseOperations.invalidate PulseOperations.invalidate
(PulseTrace.Immediate {imm= GoneOutOfScope (access_expr, call_loc); location= call_loc}) (PulseTrace.Immediate {imm= GoneOutOfScope access_expr; location= call_loc})
call_loc access_expr call_loc access_expr
in in
invalidate (HilExp.AccessExpression.dereference out_of_scope_access_expr) astate invalidate (HilExp.AccessExpression.dereference out_of_scope_access_expr) astate

16
infer/src/pulse/PulseInvalidation.ml
Unescape View File

@ -38,11 +38,11 @@ let pp_std_vector_function f = function
type t = type t =
| CFree of HilExp.AccessExpression.t * Location.t | CFree of HilExp.AccessExpression.t
| CppDelete of HilExp.AccessExpression.t * Location.t | CppDelete of HilExp.AccessExpression.t
| GoneOutOfScope of HilExp.AccessExpression.t * Location.t | GoneOutOfScope of HilExp.AccessExpression.t
| Nullptr | Nullptr
| StdVector of std_vector_function * HilExp.AccessExpression.t * Location.t | StdVector of std_vector_function * HilExp.AccessExpression.t
[@@deriving compare] [@@deriving compare]
let issue_type_of_cause = function let issue_type_of_cause = function
@ -59,14 +59,14 @@ let issue_type_of_cause = function
let pp f = function let pp f = function
| CFree (access_expr, _) -> | CFree access_expr ->
F.fprintf f "by call to `free()` on `%a`" HilExp.AccessExpression.pp access_expr F.fprintf f "by call to `free()` on `%a`" HilExp.AccessExpression.pp access_expr
| CppDelete (access_expr, _) -> | CppDelete access_expr ->
F.fprintf f "by `delete` on `%a`" HilExp.AccessExpression.pp access_expr F.fprintf f "by `delete` on `%a`" HilExp.AccessExpression.pp access_expr
| GoneOutOfScope (access_expr, _) -> | GoneOutOfScope access_expr ->
F.fprintf f "`%a` gone out of scope" HilExp.AccessExpression.pp access_expr F.fprintf f "`%a` gone out of scope" HilExp.AccessExpression.pp access_expr
| Nullptr -> | Nullptr ->
F.fprintf f "null pointer" F.fprintf f "null pointer"
| StdVector (std_vector_f, access_expr, _) -> | StdVector (std_vector_f, access_expr) ->
F.fprintf f "potentially invalidated by call to `%a()` on `%a`" pp_std_vector_function F.fprintf f "potentially invalidated by call to `%a()` on `%a`" pp_std_vector_function
std_vector_f HilExp.AccessExpression.pp access_expr std_vector_f HilExp.AccessExpression.pp access_expr

8
infer/src/pulse/PulseInvalidation.mli
Unescape View File

@ -20,11 +20,11 @@ type std_vector_function =
val pp_std_vector_function : Format.formatter -> std_vector_function -> unit val pp_std_vector_function : Format.formatter -> std_vector_function -> unit
type t = type t =
| CFree of HilExp.AccessExpression.t * Location.t | CFree of HilExp.AccessExpression.t
| CppDelete of HilExp.AccessExpression.t * Location.t | CppDelete of HilExp.AccessExpression.t
| GoneOutOfScope of HilExp.AccessExpression.t * Location.t | GoneOutOfScope of HilExp.AccessExpression.t
| Nullptr | Nullptr
| StdVector of std_vector_function * HilExp.AccessExpression.t * Location.t | StdVector of std_vector_function * HilExp.AccessExpression.t
[@@deriving compare] [@@deriving compare]
val issue_type_of_cause : t -> IssueType.t val issue_type_of_cause : t -> IssueType.t

7
infer/src/pulse/PulseModels.ml
Unescape View File

@ -26,7 +26,7 @@ module C = struct
match actuals with match actuals with
| [AccessExpression deleted_access] -> | [AccessExpression deleted_access] ->
PulseOperations.invalidate PulseOperations.invalidate
(PulseTrace.Immediate {imm= PulseInvalidation.CFree (deleted_access, location); location}) (PulseTrace.Immediate {imm= PulseInvalidation.CFree deleted_access; location})
location deleted_access astate location deleted_access astate
| _ -> | _ ->
Ok astate Ok astate
@ -40,8 +40,7 @@ module Cplusplus = struct
match actuals with match actuals with
| [AccessExpression deleted_access] -> | [AccessExpression deleted_access] ->
PulseOperations.invalidate PulseOperations.invalidate
(PulseTrace.Immediate (PulseTrace.Immediate {imm= PulseInvalidation.CppDelete deleted_access; location})
{imm= PulseInvalidation.CppDelete (deleted_access, location); location})
location deleted_access astate location deleted_access astate
| _ -> | _ ->
Ok astate Ok astate
@ -102,7 +101,7 @@ module StdVector = struct
let array_address = to_internal_array vector in let array_address = to_internal_array vector in
let array = deref_internal_array vector in let array = deref_internal_array vector in
let invalidation = let invalidation =
PulseTrace.Immediate {imm= PulseInvalidation.StdVector (vector_f, vector, location); location} PulseTrace.Immediate {imm= PulseInvalidation.StdVector (vector_f, vector); location}
in in
PulseOperations.invalidate_array_elements invalidation location array astate PulseOperations.invalidate_array_elements invalidation location array astate
>>= PulseOperations.invalidate invalidation location array >>= PulseOperations.invalidate invalidation location array

Write Preview
Loading…
Cancel
Save