Skip to content

Commit 6c6e247

Browse files
gkzmeta-codesync[bot]
authored andcommitted
[flow][refactor] Remove unused 'class' node_cache
Summary: Remove unused 'class' node_cache - we never called `set_class` anywhere. Note that we do set and get the `class_sig` node_cache - this is kept. Changelog: [internal] Reviewed By: SamChou19815 Differential Revision: D87485745 fbshipit-source-id: 373e50cd471194af7291e41d55bfa37769020253
1 parent 7f238d9 commit 6c6e247

File tree

3 files changed

+24
-43
lines changed

3 files changed

+24
-43
lines changed

src/typing/node_cache.ml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ type cache = {
3232
(Type.t * (ALoc.t, ALoc.t * Type.t) Ast.Statement.DeclareComponent.t) ALocMap.t;
3333
declared_namespaces:
3434
(Type.t * (ALoc.t, ALoc.t * Type.t) Ast.Statement.DeclareNamespace.t) ALocMap.t;
35-
classes: (Type.t * (ALoc.t, ALoc.t * Type.t) Ast.Class.t) ALocMap.t;
3635
class_sigs:
3736
( Type.t
3837
* Type.t
@@ -71,7 +70,6 @@ let mk_empty () =
7170
declared_classes = ALocMap.empty;
7271
declared_components = ALocMap.empty;
7372
declared_namespaces = ALocMap.empty;
74-
classes = ALocMap.empty;
7573
class_sigs = ALocMap.empty;
7674
tparams = ALocMap.empty;
7775
component_sigs = ALocMap.empty;
@@ -116,9 +114,6 @@ let set_declared_class cache loc class_ =
116114
let set_declared_namespace cache loc ns =
117115
cache := { !cache with declared_namespaces = ALocMap.add loc ns !cache.declared_namespaces }
118116

119-
let set_class cache loc class_ =
120-
cache := { !cache with classes = ALocMap.add loc class_ !cache.classes }
121-
122117
let set_class_sig cache loc class_ =
123118
cache := { !cache with class_sigs = ALocMap.add loc class_ !cache.class_sigs }
124119

@@ -159,8 +154,6 @@ let get_declared_component cache loc = ALocMap.find_opt loc !cache.declared_comp
159154

160155
let get_declared_namespace cache loc = ALocMap.find_opt loc !cache.declared_namespaces
161156

162-
let get_class cache loc = ALocMap.find_opt loc !cache.classes
163-
164157
let get_class_sig cache loc = ALocMap.find_opt loc !cache.class_sigs
165158

166159
let get_tparam cache loc = ALocMap.find_opt loc !cache.tparams

src/typing/node_cache.mli

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ val set_declared_component :
5252
val set_declared_namespace :
5353
t -> ALoc.t -> Type.t * (ALoc.t, ALoc.t * Type.t) Ast.Statement.DeclareNamespace.t -> unit
5454

55-
val set_class : t -> ALoc.t -> Type.t * (ALoc.t, ALoc.t * Type.t) Ast.Class.t -> unit
56-
5755
val set_class_sig :
5856
t ->
5957
ALoc.t ->
@@ -123,8 +121,6 @@ val get_declared_component :
123121
val get_declared_namespace :
124122
t -> ALoc.t -> (Type.t * (ALoc.t, ALoc.t * Type.t) Ast.Statement.DeclareNamespace.t) option
125123

126-
val get_class : t -> ALoc.t -> (Type.t * (ALoc.t, ALoc.t * Type.t) Ast.Class.t) option
127-
128124
val get_class_sig :
129125
t ->
130126
ALoc.t ->

src/typing/statement.ml

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7381,40 +7381,32 @@ module Make
73817381
)
73827382

73837383
and mk_class cx class_loc ~name_loc ?tast_class_type reason c =
7384-
let node_cache = Context.node_cache cx in
7385-
match Node_cache.get_class node_cache class_loc with
7386-
| Some x ->
7387-
Debug_js.Verbose.print_if_verbose_lazy
7388-
cx
7389-
(lazy [spf "Class cache hit at %s" (ALoc.debug_to_string (loc_of_reason reason))]);
7390-
x
7391-
| None ->
7392-
let def_reason = repos_reason class_loc reason in
7393-
let (class_t, _, class_sig, class_ast_f) =
7394-
mk_class_sig cx ~name_loc ~class_loc ~inst_kind:ClassKind reason c
7395-
in
7384+
let def_reason = repos_reason class_loc reason in
7385+
let (class_t, _, class_sig, class_ast_f) =
7386+
mk_class_sig cx ~name_loc ~class_loc ~inst_kind:ClassKind reason c
7387+
in
73967388

7397-
let public_property_map =
7398-
Class_stmt_sig.fields_to_prop_map cx
7399-
@@ Class_stmt_sig.public_fields_of_signature ~static:false class_sig
7400-
in
7401-
let private_property_map =
7402-
Class_stmt_sig.fields_to_prop_map cx
7403-
@@ Class_stmt_sig.private_fields_of_signature ~static:false class_sig
7404-
in
7405-
Class_stmt_sig.check_signature_compatibility cx def_reason class_sig;
7406-
Class_stmt_sig.toplevels cx class_sig;
7389+
let public_property_map =
7390+
Class_stmt_sig.fields_to_prop_map cx
7391+
@@ Class_stmt_sig.public_fields_of_signature ~static:false class_sig
7392+
in
7393+
let private_property_map =
7394+
Class_stmt_sig.fields_to_prop_map cx
7395+
@@ Class_stmt_sig.private_fields_of_signature ~static:false class_sig
7396+
in
7397+
Class_stmt_sig.check_signature_compatibility cx def_reason class_sig;
7398+
Class_stmt_sig.toplevels cx class_sig;
74077399

7408-
let class_body = Ast.Class.((snd c.body).Body.body) in
7409-
Context.add_voidable_check
7410-
cx
7411-
{
7412-
Context.public_property_map;
7413-
private_property_map;
7414-
errors = Property_assignment.eval_property_assignment class_body;
7415-
};
7416-
let tast_class_type = Base.Option.value tast_class_type ~default:class_t in
7417-
(class_t, class_ast_f tast_class_type)
7400+
let class_body = Ast.Class.((snd c.body).Body.body) in
7401+
Context.add_voidable_check
7402+
cx
7403+
{
7404+
Context.public_property_map;
7405+
private_property_map;
7406+
errors = Property_assignment.eval_property_assignment class_body;
7407+
};
7408+
let tast_class_type = Base.Option.value tast_class_type ~default:class_t in
7409+
(class_t, class_ast_f tast_class_type)
74187410

74197411
(* Process a class definition, returning a (polymorphic) class type. A class
74207412
type is a wrapper around an instance type, which contains types of instance

0 commit comments

Comments
 (0)