From: Jaskaran Singh <jaskaran.singh@collabora.com>
To: cocci@systeme.lip6.fr
Subject: [Cocci] [PATCH v2 3/3] parsing_c: type_annoter_c: Use name cache for type annotation
Date: Thu, 10 Sep 2020 11:47:03 +0530 [thread overview]
Message-ID: <20200910061703.2397-4-jaskaran.singh@collabora.com> (raw)
In-Reply-To: <20200910061703.2397-1-jaskaran.singh@collabora.com>
Use the name cache for type annotation. On encountering the following
which are not stored in the environment, the name cache is looked up and
the relevant header file is parsed for type information:
- struct field use
- typedef
- function call
- identifier
- enumeration constant
Signed-off-by: Jaskaran Singh <jaskaran.singh@collabora.com>
---
parsing_c/type_annoter_c.ml | 134 +++++++++++++++++++++++++++++++-----
1 file changed, 115 insertions(+), 19 deletions(-)
diff --git a/parsing_c/type_annoter_c.ml b/parsing_c/type_annoter_c.ml
index 25cb6c0ee..49fd060be 100644
--- a/parsing_c/type_annoter_c.ml
+++ b/parsing_c/type_annoter_c.ml
@@ -19,6 +19,7 @@ open Common
open Ast_c
module Lib = Lib_parsing_c
+module IC = Includes_cache
(*****************************************************************************)
(* Prelude *)
@@ -186,6 +187,13 @@ type nameenv = {
type environment = nameenv list
+let includes_parse_fn file =
+ let choose_includes = Includes.get_parsing_style () in
+ Includes.set_parsing_style Includes.Parse_no_includes;
+ let ret = Parse_c.parse_c_and_cpp false false file in
+ Includes.set_parsing_style choose_includes;
+ List.map fst (fst ret)
+
(* ------------------------------------------------------------ *)
(* can be modified by the init_env function below, by
* the file environment_unix.h
@@ -294,6 +302,39 @@ let member_env_lookup_enum s env =
| [] -> false
| env :: _ -> StringMap.mem s env.enum_constant
+(* ------------------------------------------------------------ *)
+
+let add_cache_binding_in_scope namedef =
+ let (current, older) = Common.uncons !_scoped_env in
+ let new_frame fr =
+ match namedef with
+ | IC.RetVarOrFunc (s, typ) ->
+ {fr with
+ var_or_func = StringMap.add s typ fr.var_or_func}
+ | IC.RetTypeDef (s, typ) ->
+ let cv = typ, fr.typedef, fr.level in
+ let new_typedef_c : typedefs = { defs = StringMap.add s cv fr.typedef.defs } in
+ {fr with typedef = new_typedef_c}
+ | IC.RetStructUnionNameDef (s, (su, typ)) ->
+ {fr with
+ struct_union_name_def = StringMap.add s (su, typ) fr.struct_union_name_def}
+ | IC.RetEnumConstant (s, body) ->
+ {fr with
+ enum_constant = StringMap.add s body fr.enum_constant} in
+ (* These are global, so have to reflect them in all the frames. *)
+ _scoped_env := (new_frame current)::(List.map new_frame older)
+
+(* Has side-effects on the environment.
+ * TODO: profile? *)
+let get_type_from_includes_cache file name exp_types on_success on_failure =
+ let file_bindings =
+ IC.get_types_from_name_cache
+ file name exp_types includes_parse_fn in
+ List.iter add_cache_binding_in_scope file_bindings;
+ match file_bindings with
+ [] -> on_failure ()
+ | _ -> on_success ()
+
(*****************************************************************************)
(* "type-lookup" *)
@@ -394,7 +435,14 @@ let rec type_unfold_one_step ty env =
then type_unfold_one_step t' env'
else loop (s::seen) t' env
with Not_found ->
- ty
+ let f = Ast_c.file_of_info (Ast_c.info_of_name name) in
+ get_type_from_includes_cache
+ f s [IC.CacheTypedef]
+ (fun () ->
+ let (t', env') = lookup_typedef s !_scoped_env in
+ TypeName (name, Some t') +>
+ Ast_c.rewrap_typeC ty)
+ (fun () -> ty)
)
| FieldType (t, _, _) -> type_unfold_one_step t env
@@ -474,7 +522,15 @@ let rec typedef_fix ty env =
TypeName (name, Some fixed) +>
Ast_c.rewrap_typeC ty
with Not_found ->
- ty))
+ let f = Ast_c.file_of_info (Ast_c.info_of_name name) in
+ get_type_from_includes_cache
+ f s [IC.CacheTypedef]
+ (fun () ->
+ let (t', env') = lookup_typedef s !_scoped_env in
+ TypeName (name, Some t') +>
+ Ast_c.rewrap_typeC ty)
+ (fun () -> ty)
+ ))
| FieldType (t, a, b) ->
FieldType (typedef_fix t env, a, b) +> Ast_c.rewrap_typeC ty
@@ -797,8 +853,16 @@ let annotater_expr_visitor_subpart = (fun (k,bigf) expr ->
Type_c.noTypeHere
)
| None ->
- pr2_once ("type_annotater: no type for function ident: " ^ s);
- Type_c.noTypeHere
+ let f =
+ Ast_c.file_of_info
+ (Ast_c.info_of_name ident) in
+ get_type_from_includes_cache
+ f s [IC.CacheVarFunc]
+ (fun () ->
+ match lookup_opt_env lookup_var s with
+ Some (typ, local) -> make_info_fix (typ, local)
+ | None -> Type_c.noTypeHere)
+ (fun () -> Type_c.noTypeHere)
)
)
@@ -848,22 +912,36 @@ let annotater_expr_visitor_subpart = (fun (k,bigf) expr ->
| Some _ ->
make_info_def (type_of_s "int")
| None ->
- if not (s =~ "[A-Z_]+") (* if macro then no warning *)
- then
- if !Flag_parsing_c.check_annotater then
- if not (Hashtbl.mem _notyped_var s)
- then begin
- pr2 ("Type_annoter: no type found for: " ^ s);
- Hashtbl.add _notyped_var s true;
- end
- else ()
- else
- pr2 ("Type_annoter: no type found for: " ^ s)
- ;
- Type_c.noTypeHere
- )
+ let f = Ast_c.file_of_info (Ast_c.info_of_name ident) in
+ let failure_fn =
+ (fun () ->
+ if not (s =~ "[A-Z_]+") (* if macro then no warning *)
+ then
+ if !Flag_parsing_c.check_annotater
+ then
+ if not (Hashtbl.mem _notyped_var s)
+ then
+ begin
+ pr2
+ ("Type_annoter: no type found for: " ^ s);
+ Hashtbl.add _notyped_var s true;
+ end
+ else ()
+ else pr2 ("Type_annoter: no type found for: " ^ s);
+ Type_c.noTypeHere) in
+ get_type_from_includes_cache
+ f s [IC.CacheEnumConst;IC.CacheVarFunc]
+ (fun () ->
+ match lookup_opt_env lookup_enum s with
+ Some _ -> make_info_def (type_of_s "int")
+ | None ->
+ (match lookup_opt_env lookup_var s with
+ Some (typ,local) -> make_info_fix (typ,local)
+ | None -> failure_fn ()))
+ failure_fn
)
)
+ )
(* -------------------------------------------------- *)
(* C isomorphism on type on array and pointers *)
@@ -954,7 +1032,25 @@ let annotater_expr_visitor_subpart = (fun (k,bigf) expr ->
Type_c.noTypeHere
)
| _ ->
- Type_c.noTypeHere
+ let s = Ast_c.str_of_name namefld in
+ let f = Ast_c.file_of_info (Ast_c.info_of_name namefld) in
+ let ret_typ =
+ (match (Ast_c.unwrap (snd t)) with
+ Ast_c.StructUnionName(su, sname) ->
+ get_type_from_includes_cache
+ f s [IC.CacheField sname]
+ (fun () ->
+ try
+ let ((su,fields),ii) =
+ lookup_structunion (su, sname) !_scoped_env in
+ try
+ make_info_def_fix
+ (Type_c.type_field fld (su, fields))
+ with _ -> Type_c.noTypeHere
+ with Not_found -> Type_c.noTypeHere)
+ (fun () -> Type_c.noTypeHere)
+ | _ -> Type_c.noTypeHere)
+ in ret_typ
)
)
--
2.21.3
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
next prev parent reply other threads:[~2020-09-10 6:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 6:17 [Cocci] [PATCH v2 0/3] parsing_c: Optimize recursive header file parsing Jaskaran Singh
2020-09-10 6:17 ` [Cocci] [PATCH v2 1/3] parsing_c: includes_cache: Implement a name cache Jaskaran Singh
2020-09-10 6:17 ` [Cocci] [PATCH v2 2/3] parsing_c: parse_c: Build name cache and includes dependency graph Jaskaran Singh
2020-09-10 6:17 ` Jaskaran Singh [this message]
2020-09-10 6:19 ` [Cocci] [PATCH v2 0/3] parsing_c: Optimize recursive header file parsing Jaskaran Singh
2020-09-15 19:23 ` Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200910061703.2397-4-jaskaran.singh@collabora.com \
--to=jaskaran.singh@collabora.com \
--cc=cocci@systeme.lip6.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).