File 1806-erl_types-Optimize-cache-for-remote-module... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1806-erl_types-Optimize-cache-for-remote-module-types.patch of Package erlang

From 5732196609a00de0156e76b1b864f212f7c9fdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Sun, 30 Oct 2022 05:42:56 +0100
Subject: [PATCH 06/12] erl_types: Optimize cache for remote module types

Use a map instead of a dict.
---
 lib/dialyzer/src/erl_types.erl | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/dialyzer/src/erl_types.erl b/lib/dialyzer/src/erl_types.erl
index cf5d7ab020..62588a843a 100644
--- a/lib/dialyzer/src/erl_types.erl
+++ b/lib/dialyzer/src/erl_types.erl
@@ -4183,12 +4183,12 @@ mod_name(Mod, Name) ->
 -type cache_key() :: {module(), atom(), expand_depth(),
                       [erl_type()], type_names()}.
 -type mod_type_table() :: ets:tid().
--type mod_records() :: dict:dict(module(), type_table()).
+-type mod_records() :: #{module() => type_table()}.
 -type exported_type_table() :: ets:tid().
 -record(cache,
         {
-          types = maps:new() :: #{cache_key() => {erl_type(), expand_limit()}},
-          mod_recs = {mrecs, dict:new()} :: {'mrecs', mod_records()}
+         types = #{} :: #{cache_key() => {erl_type(), expand_limit()}},
+         mod_recs = #{} :: mod_records()
         }).
 
 -opaque cache() :: #cache{}.
@@ -4205,11 +4205,11 @@ t_from_form(Form, ExpTypes, Site, RecDict, VarTab, Cache) ->
 
 t_from_form_without_remote(Form, Site, TypeTable) ->
   Module = site_module(Site),
-  ModRecs = dict:from_list([{Module, TypeTable}]),
+  ModRecs = #{Module => TypeTable},
   ExpTypes = replace_by_none,
   VarTab = var_table__new(),
   Cache0 = cache__new(),
-  Cache = Cache0#cache{mod_recs = {mrecs, ModRecs}},
+  Cache = Cache0#cache{mod_recs = ModRecs},
   {Type, _} = t_from_form1(Form, ExpTypes, Site, undefined, VarTab, Cache),
   Type.
 
@@ -5162,17 +5162,17 @@ is_erl_type(_) -> false.
                              'error' | {type_table(), cache()}.
 
 lookup_module_types(Module, CodeTable, Cache) ->
-  #cache{mod_recs = {mrecs, MRecs}} = Cache,
-  case dict:find(Module, MRecs) of
-    {ok, R} ->
+  #cache{mod_recs = MRecs} = Cache,
+  case MRecs of
+    #{Module := R} ->
       {R, Cache};
-    error ->
-      try ets:lookup_element(CodeTable, Module, 2) of
+    #{} ->
+      case ets:lookup_element(CodeTable, Module, 2, error) of
+        error ->
+          error;
         R ->
-          NewMRecs = dict:store(Module, R, MRecs),
-          {R, Cache#cache{mod_recs = {mrecs, NewMRecs}}}
-      catch
-        _:_ -> error
+          NewMRecs = MRecs#{Module => R},
+          {R, Cache#cache{mod_recs = NewMRecs}}
       end
   end.
 
-- 
2.35.3

Places

File 1806-erl_types-Optimize-cache-for-remote-module-types.patch of Package erlang

Places