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

[clang] Catch a few more occurring incorrect assumptions

Browse Source 
Reviewed By: avarun42

Differential Revision: D6976263

fbshipit-source-id: deec623
master
Dulma Churchill 7 years ago committed by Facebook Github Bot
parent fbf0020399
commit c38052bbaa
3 changed files with 161 additions and 138 deletions
Show Stats Download Patch File Download Diff File

31
infer/src/clang/ComponentKit.ml
Unescape View File

@ -90,6 +90,7 @@ and contains_ck_impl decl_list =
const NSString *y; const NSString *y;
``` *) ``` *)
let mutable_local_vars_advice context an = let mutable_local_vars_advice context an =
try
let rec get_referenced_type (qual_type: Clang_ast_t.qual_type) : Clang_ast_t.decl option = let rec get_referenced_type (qual_type: Clang_ast_t.qual_type) : Clang_ast_t.decl option =
let typ_opt = CAst_utils.get_desugared_type qual_type.qt_type_ptr in let typ_opt = CAst_utils.get_desugared_type qual_type.qt_type_ptr in
match (typ_opt : Clang_ast_t.c_type option) with match (typ_opt : Clang_ast_t.c_type option) with
@ -119,8 +120,10 @@ let mutable_local_vars_advice context an =
| _ -> | _ ->
false false
in in
if is_ck_context context an then
match an with match an with
| Ctl_parser_types.Decl (Clang_ast_t.VarDecl (decl_info, named_decl_info, qual_type, _) as decl) -> | Ctl_parser_types.Decl
(Clang_ast_t.VarDecl (decl_info, named_decl_info, qual_type, _) as decl) ->
let is_const_ref = let is_const_ref =
match CAst_utils.get_type qual_type.qt_type_ptr with match CAst_utils.get_type qual_type.qt_type_ptr with
| Some LValueReferenceType (_, {Clang_ast_t.qt_is_const}) -> | Some LValueReferenceType (_, {Clang_ast_t.qt_is_const}) ->
@ -129,14 +132,14 @@ let mutable_local_vars_advice context an =
false false
in in
let is_const = qual_type.qt_is_const || is_const_ref in let is_const = qual_type.qt_is_const || is_const_ref in
let condition = let should_not_report_mutable_local =
is_ck_context context an && not (CAst_utils.is_syntactically_global_var decl) CAst_utils.is_syntactically_global_var decl || CAst_utils.is_static_local_var decl
&& not (CAst_utils.is_static_local_var decl) && not is_const || is_const || is_of_whitelisted_type qual_type || decl_info.di_is_implicit
&& not (is_of_whitelisted_type qual_type) && not decl_info.di_is_implicit || context.CLintersContext.in_for_loop_declaration
&& not context.CLintersContext.in_for_loop_declaration || CAst_utils.is_std_vector qual_type || CAst_utils.has_block_attribute decl
&& not (CAst_utils.is_std_vector qual_type) && not (CAst_utils.has_block_attribute decl)
in in
if condition then if should_not_report_mutable_local then None
else
Some Some
{ CIssue.id= "MUTABLE_LOCAL_VARIABLE_IN_COMPONENT_FILE" { CIssue.id= "MUTABLE_LOCAL_VARIABLE_IN_COMPONENT_FILE"
; name= None ; name= None
@ -148,9 +151,14 @@ let mutable_local_vars_advice context an =
; suggestion= Some "Add a const (after the asterisk for pointer types)." ; suggestion= Some "Add a const (after the asterisk for pointer types)."
; doc_url= None ; doc_url= None
; loc= CFrontend_checkers.location_from_dinfo context decl_info } ; loc= CFrontend_checkers.location_from_dinfo context decl_info }
else None
| _ -> | _ ->
None None
else None
with CFrontend_config.IncorrectAssumption e ->
let trans_unit_ctx = context.CLintersContext.translation_unit_context in
ClangLogging.log_caught_exception trans_unit_ctx "IncorrectAssumption" e.position
e.source_range e.ast_node ;
None
(* Should only be called with a VarDecl *) (* Should only be called with a VarDecl *)
@ -163,12 +171,12 @@ let component_factory_function_advice context an =
let is_component_if decl = let is_component_if decl =
CAst_utils.is_objc_if_descendant decl [CFrontend_config.ckcomponent_cl] CAst_utils.is_objc_if_descendant decl [CFrontend_config.ckcomponent_cl]
in in
if is_ck_context context an then
match an with match an with
| Ctl_parser_types.Decl | Ctl_parser_types.Decl
Clang_ast_t.FunctionDecl (decl_info, _, (qual_type: Clang_ast_t.qual_type), _) -> Clang_ast_t.FunctionDecl (decl_info, _, (qual_type: Clang_ast_t.qual_type), _) ->
let objc_interface = CAst_utils.qual_type_to_objc_interface qual_type in let objc_interface = CAst_utils.qual_type_to_objc_interface qual_type in
let condition = is_ck_context context an && is_component_if objc_interface in if is_component_if objc_interface then
if condition then
Some Some
{ CIssue.id= "COMPONENT_FACTORY_FUNCTION" { CIssue.id= "COMPONENT_FACTORY_FUNCTION"
; name= None ; name= None
@ -183,6 +191,7 @@ let component_factory_function_advice context an =
else None else None
| _ -> | _ ->
None None
else None
(* Should only be called with FunctionDecl *) (* Should only be called with FunctionDecl *)

23
infer/src/clang/cFrontend_decl.ml
Unescape View File

@ -94,6 +94,7 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
let function_decl trans_unit_ctx tenv cfg func_decl block_data_opt = let function_decl trans_unit_ctx tenv cfg func_decl block_data_opt =
try
let captured_vars, outer_context_opt = let captured_vars, outer_context_opt =
match block_data_opt with match block_data_opt with
| Some (outer_context, _, _, captured_vars) -> | Some (outer_context, _, _, captured_vars) ->
@ -109,15 +110,20 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
(* Only in the case the function declaration has a defined body we create a procdesc *) (* Only in the case the function declaration has a defined body we create a procdesc *)
let procname = CMethod_signature.ms_get_name ms in let procname = CMethod_signature.ms_get_name ms in
let return_param_typ_opt = CMethod_signature.ms_get_return_param_typ ms in let return_param_typ_opt = CMethod_signature.ms_get_return_param_typ ms in
if CMethod_trans.create_local_procdesc trans_unit_ctx cfg tenv ms [body] captured_vars then if CMethod_trans.create_local_procdesc trans_unit_ctx cfg tenv ms [body] captured_vars
then
add_method trans_unit_ctx tenv cfg CContext.ContextNoCls procname body ms add_method trans_unit_ctx tenv cfg CContext.ContextNoCls procname body ms
return_param_typ_opt false outer_context_opt extra_instrs return_param_typ_opt false outer_context_opt extra_instrs
| None -> | None ->
() ()
with CFrontend_config.IncorrectAssumption e ->
ClangLogging.log_caught_exception trans_unit_ctx "IncorrectAssumption" e.position
e.source_range e.ast_node
let process_method_decl ?(set_objc_accessor_attr= false) ?(is_destructor= false) trans_unit_ctx let process_method_decl ?(set_objc_accessor_attr= false) ?(is_destructor= false) trans_unit_ctx
tenv cfg curr_class meth_decl ~is_objc = tenv cfg curr_class meth_decl ~is_objc =
try
let ms, body_opt, extra_instrs = let ms, body_opt, extra_instrs =
CMethod_trans.method_signature_of_decl trans_unit_ctx tenv meth_decl None CMethod_trans.method_signature_of_decl trans_unit_ctx tenv meth_decl None
in in
@ -130,8 +136,8 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
(* For a destructor we create two procedures: a destructor wrapper and an inner destructor *) (* For a destructor we create two procedures: a destructor wrapper and an inner destructor *)
(* A destructor wrapper is called from the outside, i.e. for destructing local variables and fields *) (* A destructor wrapper is called from the outside, i.e. for destructing local variables and fields *)
(* The destructor wrapper calls the inner destructor which has the actual body *) (* The destructor wrapper calls the inner destructor which has the actual body *)
if CMethod_trans.create_local_procdesc ~set_objc_accessor_attr trans_unit_ctx cfg tenv if CMethod_trans.create_local_procdesc ~set_objc_accessor_attr trans_unit_ctx cfg
ms [body] [] tenv ms [body] []
then then
add_method trans_unit_ctx tenv cfg curr_class procname body ms return_param_typ_opt add_method trans_unit_ctx tenv cfg curr_class procname body ms return_param_typ_opt
is_objc None extra_instrs ~is_destructor_wrapper:true ; is_objc None extra_instrs ~is_destructor_wrapper:true ;
@ -146,16 +152,19 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
(ms', procname') ) (ms', procname') )
else (ms, procname) else (ms, procname)
in in
if CMethod_trans.create_local_procdesc ~set_objc_accessor_attr trans_unit_ctx cfg tenv ms' if CMethod_trans.create_local_procdesc ~set_objc_accessor_attr trans_unit_ctx cfg tenv
[body] [] ms' [body] []
then then
add_method trans_unit_ctx tenv cfg curr_class procname' body ms' return_param_typ_opt add_method trans_unit_ctx tenv cfg curr_class procname' body ms' return_param_typ_opt
is_objc None extra_instrs ~is_destructor_wrapper:false is_objc None extra_instrs ~is_destructor_wrapper:false
| None -> | None ->
if set_objc_accessor_attr then if set_objc_accessor_attr then
ignore ignore
(CMethod_trans.create_local_procdesc ~set_objc_accessor_attr trans_unit_ctx cfg tenv ms (CMethod_trans.create_local_procdesc ~set_objc_accessor_attr trans_unit_ctx cfg tenv
[] []) ms [] [])
with CFrontend_config.IncorrectAssumption e ->
ClangLogging.log_caught_exception trans_unit_ctx "IncorrectAssumption" e.position
e.source_range e.ast_node
let process_property_implementation trans_unit_ctx tenv cfg curr_class let process_property_implementation trans_unit_ctx tenv cfg curr_class

5
infer/src/clang/cFrontend_errors.ml
Unescape View File

@ -471,8 +471,13 @@ let fill_issue_desc_info_and_log context an (issue_desc: CIssue.issue_desc) lint
let description = process_message issue_desc.description in let description = process_message issue_desc.description in
let suggestion = Option.map ~f:process_message issue_desc.suggestion in let suggestion = Option.map ~f:process_message issue_desc.suggestion in
let issue_desc' = {issue_desc with description; loc; suggestion} in let issue_desc' = {issue_desc with description; loc; suggestion} in
try
log_frontend_issue context.CLintersContext.translation_unit_context log_frontend_issue context.CLintersContext.translation_unit_context
context.CLintersContext.current_method an issue_desc' linters_def_file context.CLintersContext.current_method an issue_desc' linters_def_file
with CFrontend_config.IncorrectAssumption e ->
let trans_unit_ctx = context.CLintersContext.translation_unit_context in
ClangLogging.log_caught_exception trans_unit_ctx "IncorrectAssumption" e.position
e.source_range e.ast_node
(* Calls the set of hard coded checkers (if any) *) (* Calls the set of hard coded checkers (if any) *)

Write Preview
Loading…
Cancel
Save