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

[ownership] use Base instead of Var

Browse Source 
Summary: This makes the code cleaner, and also makes it easier to look at the type of a var (needed in a successor).

Reviewed By: jeremydubreil

Differential Revision: D7359466

fbshipit-source-id: 5acdb7a
master
Sam Blackshear 7 years ago committed by Facebook Github Bot
parent 373b43eebf
commit 082e3f1f9e
1 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File

74
infer/src/checkers/Ownership.ml
Unescape View File

@ -10,7 +10,16 @@
open! IStd open! IStd
module F = Format module F = Format
module L = Logging module L = Logging
module VarSet = AbstractDomain.FiniteSet (Var)
module Base = struct
type t = AccessPath.base
let compare = AccessPath.compare_base
let pp = AccessPath.pp_base
end
module VarSet = AbstractDomain.FiniteSet (Base)
module CapabilityDomain = struct module CapabilityDomain = struct
type astate = type astate =
@ -83,9 +92,9 @@ let rec is_function_typ = function
(** map from program variable to its capability *) (** map from program variable to its capability *)
module Domain = struct module Domain = struct
include AbstractDomain.Map (Var) (CapabilityDomain) include AbstractDomain.Map (Base) (CapabilityDomain)
let report_use_after_lifetime var ~use_loc ~invalidated_loc summary = let report_use_after_lifetime (var, _) ~use_loc ~invalidated_loc summary =
let message = let message =
F.asprintf "Variable %a is used at line %a after its lifetime ended at %a" Var.pp var F.asprintf "Variable %a is used at line %a after its lifetime ended at %a" Var.pp var
Location.pp use_loc Location.pp invalidated_loc Location.pp use_loc Location.pp invalidated_loc
@ -99,17 +108,17 @@ module Domain = struct
(* complain if we do not have the right capability to access [var] *) (* complain if we do not have the right capability to access [var] *)
let check_var_lifetime var use_loc summary astate = let check_var_lifetime base_var use_loc summary astate =
let open CapabilityDomain in let open CapabilityDomain in
match find var astate with match find base_var astate with
| InvalidatedAt invalidated_loc -> | InvalidatedAt invalidated_loc ->
report_use_after_lifetime var ~use_loc ~invalidated_loc summary report_use_after_lifetime base_var ~use_loc ~invalidated_loc summary
| BorrowedFrom borrowed_vars -> | BorrowedFrom borrowed_vars ->
(* warn if any of the borrowed vars are Invalid *) (* warn if any of the borrowed vars are Invalid *)
let report_invalidated v = let report_invalidated v =
match find v astate with match find v astate with
| InvalidatedAt invalidated_loc -> | InvalidatedAt invalidated_loc ->
report_use_after_lifetime var ~use_loc ~invalidated_loc summary report_use_after_lifetime base_var ~use_loc ~invalidated_loc summary
| BorrowedFrom _ | BorrowedFrom _
(* TODO: can do deeper checking here, but have to worry about borrow cycles *) (* TODO: can do deeper checking here, but have to worry about borrow cycles *)
| Owned -> | Owned ->
@ -124,7 +133,7 @@ module Domain = struct
() ()
let base_add_read (base_var, typ) loc summary astate = let base_add_read ((_, typ) as base_var) loc summary astate =
(* don't warn if it's a read of a std::function type. we model closures as borrowing their (* don't warn if it's a read of a std::function type. we model closures as borrowing their
captured vars, but simply reading a closure doesn't actually use these vars. this means that captured vars, but simply reading a closure doesn't actually use these vars. this means that
we'll miss bugs involving invalid uses of std::function's, but that seems ok *) we'll miss bugs involving invalid uses of std::function's, but that seems ok *)
@ -149,17 +158,17 @@ module Domain = struct
~init:astate ~init:astate
let borrow_vars lhs_var rhs_vars astate = let borrow_vars lhs_base rhs_vars astate =
(* borrow all of the vars read on the rhs *) (* borrow all of the vars read on the rhs *)
if VarSet.is_empty rhs_vars then remove lhs_var astate if VarSet.is_empty rhs_vars then remove lhs_base astate
else add lhs_var (CapabilityDomain.make_borrowed_vars rhs_vars) astate else add lhs_base (CapabilityDomain.make_borrowed_vars rhs_vars) astate
let borrow_exp lhs_var rhs_exp astate = let borrow_exp lhs_var rhs_exp astate =
let rhs_vars = let rhs_vars =
List.fold (HilExp.get_access_exprs rhs_exp) List.fold (HilExp.get_access_exprs rhs_exp)
~f:(fun acc access_expr -> ~f:(fun acc access_expr ->
let (var, _), _ = AccessExpression.to_access_path access_expr in let var, _ = AccessExpression.to_access_path access_expr in
VarSet.add var acc ) VarSet.add var acc )
~init:VarSet.empty ~init:VarSet.empty
in in
@ -167,40 +176,40 @@ module Domain = struct
(* handle assigning directly to a base var *) (* handle assigning directly to a base var *)
let handle_var_assign (lhs_var, lhs_typ) rhs_exp loc summary astate = let handle_var_assign ((lhs_var, lhs_typ) as lhs_base) rhs_exp loc summary astate =
if Var.is_return lhs_var then exp_add_reads rhs_exp loc summary astate if Var.is_return lhs_var then exp_add_reads rhs_exp loc summary astate
else else
match rhs_exp with match rhs_exp with
| HilExp.AccessExpression AccessExpression.AddressOf address_taken_exp -> | HilExp.AccessExpression AccessExpression.AddressOf address_taken_exp ->
borrow_exp lhs_var (AccessExpression address_taken_exp) astate borrow_exp lhs_base (AccessExpression address_taken_exp) astate
| HilExp.AccessExpression AccessExpression.Base (rhs_var, _) | HilExp.AccessExpression AccessExpression.Base ((rhs_var, _) as rhs_base)
when not (Var.appears_in_source_code rhs_var) -> ( when not (Var.appears_in_source_code rhs_var) -> (
try try
(* assume assignments with non-source vars on the RHS transfer capabilities to the LHS (* assume assignments with non-source vars on the RHS transfer capabilities to the LHS
var *) var *)
(* copy capability from RHS to LHS *) (* copy capability from RHS to LHS *)
let base_capability = find rhs_var astate in let base_capability = find rhs_base astate in
add lhs_var base_capability astate add lhs_base base_capability astate
with Not_found -> with Not_found ->
(* no existing capability on RHS. don't make any assumptions about LHS capability *) (* no existing capability on RHS. don't make any assumptions about LHS capability *)
remove lhs_var astate ) remove lhs_base astate )
| HilExp.AccessExpression AccessExpression.Base (_, rhs_typ) | HilExp.AccessExpression AccessExpression.Base (_, rhs_typ)
when is_function_typ lhs_typ || is_function_typ rhs_typ -> when is_function_typ lhs_typ || is_function_typ rhs_typ ->
(* an assignment borrows if the LHS/RHS is a function type, but for now assume that it (* an assignment borrows if the LHS/RHS is a function type, but for now assume that it
copies resources correctly for any other type. eventually, we'll check this assumption *) copies resources correctly for any other type. eventually, we'll check this assumption *)
borrow_exp lhs_var rhs_exp astate borrow_exp lhs_base rhs_exp astate
| HilExp.Closure (_, captured_vars) -> | HilExp.Closure (_, captured_vars) ->
(* TODO: can be folded into the case above once we have proper AccessExpressions *) (* TODO: can be folded into the case above once we have proper AccessExpressions *)
let vars_captured_by_ref = let vars_captured_by_ref =
List.fold captured_vars List.fold captured_vars
~f:(fun acc ((var, typ), _) -> ~f:(fun acc (((_, typ) as base), _) ->
match typ.Typ.desc with Typ.Tptr _ -> VarSet.add var acc | _ -> acc ) match typ.Typ.desc with Typ.Tptr _ -> VarSet.add base acc | _ -> acc )
~init:VarSet.empty ~init:VarSet.empty
in in
borrow_vars lhs_var vars_captured_by_ref astate borrow_vars lhs_base vars_captured_by_ref astate
| _ -> | _ ->
(* TODO: support capability transfer between source vars, other assignment modes *) (* TODO: support capability transfer between source vars, other assignment modes *)
exp_add_reads rhs_exp loc summary astate |> remove lhs_var exp_add_reads rhs_exp loc summary astate |> remove lhs_base
end end
module TransferFunctions (CFG : ProcCfg.S) = struct module TransferFunctions (CFG : ProcCfg.S) = struct
@ -217,7 +226,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
let astate' = Domain.actuals_add_reads actuals loc summary astate in let astate' = Domain.actuals_add_reads actuals loc summary astate in
match return_opt with match return_opt with
| Some return_base -> | Some return_base ->
Some (Domain.add (fst return_base) CapabilityDomain.Owned astate') Some (Domain.add return_base CapabilityDomain.Owned astate')
| None -> | None ->
Some astate' Some astate'
else if Typ.Procname.equal pname BuiltinDecl.__placement_new then else if Typ.Procname.equal pname BuiltinDecl.__placement_new then
@ -226,16 +235,15 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
(* placement new creates an alias between return var and placement var. model as (* placement new creates an alias between return var and placement var. model as
return borrowing from placement *) return borrowing from placement *)
Domain.actuals_add_reads other_actuals loc summary astate Domain.actuals_add_reads other_actuals loc summary astate
|> Domain.add (fst placement_base) CapabilityDomain.Owned |> Domain.add placement_base CapabilityDomain.Owned
|> Domain.borrow_vars (fst return_base) (VarSet.singleton (fst placement_base)) |> Domain.borrow_vars return_base (VarSet.singleton placement_base) |> Option.some
|> Option.some
| _ -> | _ ->
L.die InternalError "Placement new without placement arg and/or return" L.die InternalError "Placement new without placement arg and/or return"
else if Typ.Procname.is_constructor pname then else if Typ.Procname.is_constructor pname then
match actuals with match actuals with
| (HilExp.AccessExpression Base constructed_base) :: other_actuals -> | (HilExp.AccessExpression Base constructed_base) :: other_actuals ->
let astate' = Domain.actuals_add_reads other_actuals loc summary astate in let astate' = Domain.actuals_add_reads other_actuals loc summary astate in
Some (Domain.add (fst constructed_base) CapabilityDomain.Owned astate') Some (Domain.add constructed_base CapabilityDomain.Owned astate')
| _ -> | _ ->
Some astate Some astate
else None else None
@ -290,10 +298,10 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
(* assign to field, array, indirectly with &/*, or a combination *) (* assign to field, array, indirectly with &/*, or a combination *)
Domain.exp_add_reads rhs_exp loc summary astate Domain.exp_add_reads rhs_exp loc summary astate
|> Domain.access_path_add_read (AccessExpression.to_access_path lhs_access_exp) loc summary |> Domain.access_path_add_read (AccessExpression.to_access_path lhs_access_exp) loc summary
| Call (_, Direct callee_pname, [(AccessExpression Base ((lhs_var, _) as lhs_base))], _, loc) | Call (_, Direct callee_pname, [(AccessExpression Base lhs_base)], _, loc)
when transfers_ownership callee_pname -> when transfers_ownership callee_pname ->
Domain.base_add_read lhs_base loc summary astate Domain.base_add_read lhs_base loc summary astate
|> Domain.add lhs_var (CapabilityDomain.InvalidatedAt loc) |> Domain.add lhs_base (CapabilityDomain.InvalidatedAt loc)
| Call | Call
( _ ( _
, Direct Typ.Procname.ObjC_Cpp callee_pname , Direct Typ.Procname.ObjC_Cpp callee_pname
@ -307,12 +315,12 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
| Call | Call
( _ ( _
, Direct Typ.Procname.ObjC_Cpp callee_pname , Direct Typ.Procname.ObjC_Cpp callee_pname
, (AccessExpression Base (lhs_var, _)) :: _ , (AccessExpression Base lhs_base) :: _
, _ , _
, loc ) , loc )
when Typ.Procname.ObjC_Cpp.is_cpp_lambda callee_pname -> when Typ.Procname.ObjC_Cpp.is_cpp_lambda callee_pname ->
(* invoking a lambda; check that it's captured vars are valid *) (* invoking a lambda; check that it's captured vars are valid *)
Domain.check_var_lifetime lhs_var loc summary astate ; Domain.check_var_lifetime lhs_base loc summary astate ;
astate astate
| Call (ret_opt, call_exp, actuals, _, loc) -> ( | Call (ret_opt, call_exp, actuals, _, loc) -> (
match acquire_ownership call_exp ret_opt actuals loc summary astate with match acquire_ownership call_exp ret_opt actuals loc summary astate with
@ -324,7 +332,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
Domain.empty Domain.empty
else else
let astate' = Domain.actuals_add_reads actuals loc summary astate in let astate' = Domain.actuals_add_reads actuals loc summary astate in
match ret_opt with Some base -> Domain.remove (fst base) astate' | None -> astate' ) match ret_opt with Some base -> Domain.remove base astate' | None -> astate' )
| Assume (assume_exp, _, _, loc) -> | Assume (assume_exp, _, _, loc) ->
Domain.exp_add_reads assume_exp loc summary astate Domain.exp_add_reads assume_exp loc summary astate
end end

Write Preview
Loading…
Cancel
Save