Merge branch 'john/dialyzer/fix-opaque-crash/ERIERL-1183/OTP-19439' i…

…nto maint-26 * john/dialyzer/fix-opaque-crash/ERIERL-1183/OTP-19439: dialyzer: Fix opaque-related crash
erlang · Jan 26, 2025 · af2c808 · af2c808
2 parents 3ab62c7 + d1e4878
commit af2c808
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/lib/dialyzer/src/erl_types.erl b/lib/dialyzer/src/erl_types.erl
@@ -632,6 +632,7 @@ t_decorate_with_opaque(T1, T2, Opaques) ->
   end.
 
 decorate(Type, ?none, _Opaques) -> Type;
+decorate(Type, ?unit, _Opaques) -> Type;
 decorate(?function(Domain, Range), ?function(D, R), Opaques) ->
   ?function(decorate(Domain, D, Opaques), decorate(Range, R, Opaques));
 decorate(?list(Types, Tail, Size), ?list(Ts, Tl, _Sz), Opaques) ->

diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug6.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug6.erl
@@ -0,0 +1,19 @@
+-module(opaque_bug6).
+
+-export([loop/1]).
+-export_type([unused_dummy/0]).
+
+-type other_type() :: opaque_bug6_adt:adt().
+
+%% Required for decorate/3 to be called, jarring the bug loose. Does not need
+%% to be used anywhere.
+-opaque unused_dummy() :: {pid(), binary()}.
+
+-spec loop(other_type()) -> no_return().
+loop(OtherType) ->
+    receive
+        _X ->
+            loop(OtherType)
+    after timer:minutes(30) ->
+            opaque_bug6_adt:do(OtherType)
+    end.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug6_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug6_adt.erl
@@ -0,0 +1,8 @@
+-module(opaque_bug6_adt).
+-export([do/1]).
+
+-export_type([adt/0]).
+-opaque adt() :: {a, term()}.
+
+-spec do(adt()) -> ok | {error, atom()}.
+do({Mod, Arg}) -> Mod:foo(Arg).