File 0266-dialyzer-Correct-a-parameterized-opaque-ty... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0266-dialyzer-Correct-a-parameterized-opaque-types-bug.patch of Package erlang (Revision 3aaa84d7d540d57752db68644dc4a4df)

Currently displaying revision 3aaa84d7d540d57752db68644dc4a4df , Show latest

From 40a3cb7a4657175e5f385d326a63ef012f51585d Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Thu, 15 Feb 2018 16:30:12 +0100
Subject: [PATCH] dialyzer: Correct a parameterized opaque types bug

See also https://bugs.erlang.org/browse/ERL-565.

To avoid loops, erl_types:t_is_subtype checks for equality using
unopaqued types, but in (at least) one case something is lost:

This fix makes sure that when forwarding arguments in dataflow, types
with different parameters but equal when unopaqued are considered
different.

For example, dict:dict(0, {}) and dict:dict(0, []) are equal when
unopaqued (due to how dict(_, _) is declared in module dict), but
should be considered different when forwarding args.
---
 lib/dialyzer/src/dialyzer_dataflow.erl                    | 14 +++++++-------
 lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl | 15 +++++++++++++++
 .../test/opaque_SUITE_data/src/para_bug/same_type.erl     | 13 +++++++++++++
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl
 create mode 100644 lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl

diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index fca5b74a9e..ea3523a965 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -3448,19 +3448,19 @@ state__fun_info(Fun, #state{callgraph = CG, fun_tab = FunTab, plt = PLT}) ->
   {Fun, Sig, Contract, LocalRet}.
 
 forward_args(Fun, ArgTypes, #state{work = Work, fun_tab = FunTab} = State) ->
-  {OldArgTypes, OldOut, Fixpoint} =
+  {NewArgTypes, OldOut, Fixpoint} =
     case dict:find(Fun, FunTab) of
-      {ok, {not_handled, {OldArgTypes0, OldOut0}}} ->
-	{OldArgTypes0, OldOut0, false};
+      {ok, {not_handled, {_OldArgTypesAreNone, OldOut0}}} ->
+	{ArgTypes, OldOut0, false};
       {ok, {OldArgTypes0, OldOut0}} ->
-	{OldArgTypes0, OldOut0,
-	 t_is_subtype(t_product(ArgTypes), t_product(OldArgTypes0))}
+        NewArgTypes0 = [t_sup(X, Y) ||
+                         {X, Y} <- lists:zip(ArgTypes, OldArgTypes0)],
+	{NewArgTypes0, OldOut0,
+         t_is_equal(t_product(NewArgTypes0), t_product(OldArgTypes0))}
     end,
   case Fixpoint of
     true -> State;
     false ->
-      NewArgTypes = [t_sup(X, Y) ||
-                      {X, Y} <- lists:zip(ArgTypes, OldArgTypes)],
       NewWork = add_work(Fun, Work),
       ?debug("~w: forwarding args ~s\n",
 	     [state__lookup_name(Fun, State),
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl
new file mode 100644
index 0000000000..44149f4199
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl
@@ -0,0 +1,15 @@
+-module(same).
+
+-export([baz/1]).
+
+-record(bar, {
+          a :: same_type:st(integer()),
+          b :: same_type:st(atom())
+         }).
+
+baz(Bar) ->
+    _ = wrap_find(0, Bar#bar.a),
+    wrap_find(0, Bar#bar.b).
+
+wrap_find(K, D) ->
+  same_type:t(K, D).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl
new file mode 100644
index 0000000000..855a5d30be
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl
@@ -0,0 +1,13 @@
+-module(same_type).
+
+-export([t/2]).
+
+-export_type([st/1]).
+
+%% When unopaqued all specializations of st/1 are equal.
+-opaque st(_A) :: {st, tuple()}.
+
+-spec t(_, st(_)) -> _.
+
+t(K, V) ->
+    {K, V}.
-- 
2.16.2

Places

File 0266-dialyzer-Correct-a-parameterized-opaque-types-bug.patch of Package erlang (Revision 3aaa84d7d540d57752db68644dc4a4df)

Places