Merge branch 'maint'

* maint:
  Update preloaded
  erts: Correct type declaration of match specification head

Conflicts:
	erts/preloaded/ebin/erlang.beam
	erts/preloaded/ebin/erts_internal.beam

6 files changed, 32 insertions, 2 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 3d1775e973..4d12daa61a 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -9564,6 +9564,10 @@ timestamp() ->
       <type name="trace_info_item_result"/>
       <type name="trace_info_flag"/>
       <type name="trace_match_spec"/>
+      <type name="match_variable"/>
+      <type_desc name="match_variable">
+        Approximation of '$1' | '$2' | '$3' | ...
+      </type_desc>
       <desc>
         <p>Returns trace information about a port, process, function, or
           event.</p>
@@ -9695,6 +9699,10 @@ timestamp() ->
       </fsummary>
       <type name="trace_pattern_mfa"/>
       <type name="trace_match_spec"/>
+      <type_desc name="match_variable">
+        Approximation of '$1' | '$2' | '$3' | ...
+      </type_desc>
+      <type name="match_variable"/>
       <desc>
         <p>The same as
           <seealso marker="#trace_pattern/3">
@@ -9707,6 +9715,10 @@ timestamp() ->
       <name name="trace_pattern" arity="3" clause_i="1"/>
       <fsummary>Set trace pattern for message sending.</fsummary>
       <type name="trace_match_spec"/>
+      <type name="match_variable"/>
+      <type_desc name="match_variable">
+        Approximation of '$1' | '$2' | '$3' | ...
+      </type_desc>
       <desc>
         <p>Sets trace pattern for <em>message sending</em>.
           Must be combined with
@@ -9774,6 +9786,10 @@ timestamp() ->
       <name name="trace_pattern" arity="3" clause_i="2"/>
       <fsummary>Set trace pattern for tracing of message receiving.</fsummary>
       <type name="trace_match_spec"/>
+      <type name="match_variable"/>
+      <type_desc name="match_variable">
+        Approximation of '$1' | '$2' | '$3' | ...
+      </type_desc>
       <desc>
         <p>Sets trace pattern for <em>message receiving</em>.
           Must be combined with
@@ -9844,6 +9860,10 @@ timestamp() ->
       <type name="trace_pattern_mfa"/>
       <type name="trace_match_spec"/>
       <type name="trace_pattern_flag"/>
+      <type name="match_variable"/>
+      <type_desc name="match_variable">
+        Approximation of '$1' | '$2' | '$3' | ...
+      </type_desc>
       <desc>
         <p>Enables or disables <em>call tracing</em> for one or more functions.
           Must be combined with
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index fa5960dffd..6159228bff 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 0a78c5b6c3..aae3976298 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index da08ab383b..f502a7cd36 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2428,10 +2428,11 @@ term_to_binary(_Term, _Options) ->
 tl(_List) ->
     erlang:nif_error(undefined).
 
+-type match_variable() :: atom(). % Approximation of '$1' | '$2' | ...
 -type trace_pattern_mfa() ::
       {atom(),atom(),arity() | '_'} | on_load.
 -type trace_match_spec() ::
-      [{[term()] | '_' ,[term()],[term()]}].
+      [{[term()] | '_' | match_variable() ,[term()],[term()]}].
 
 -spec erlang:trace_pattern(MFA, MatchSpec) -> non_neg_integer() when
       MFA :: trace_pattern_mfa() | send | 'receive',
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index fecdfc348c..a27cb2ba38 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -436,10 +436,11 @@ microstate_accounting(Ref, Threads) ->
 trace(_PidSpec, _How, _FlagList) ->
     erlang:nif_error(undefined).
 
+-type match_variable() :: atom(). % Approximation of '$1' | '$2' | ...
 -type trace_pattern_mfa() ::
       {atom(),atom(),arity() | '_'} | on_load.
 -type trace_match_spec() ::
-      [{[term()] | '_' ,[term()],[term()]}].
+      [{[term()] | '_' | match_variable() ,[term()],[term()]}].
 
 -spec trace_pattern(MFA, MatchSpec, FlagList) -> non_neg_integer() when
       MFA :: trace_pattern_mfa(),
diff --git a/lib/dialyzer/test/small_SUITE_data/src/ms.erl b/lib/dialyzer/test/small_SUITE_data/src/ms.erl
new file mode 100644
index 0000000000..47a5e886cf
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/ms.erl
@@ -0,0 +1,8 @@
+-module(ms).
+-export([t/0]).
+
+-include_lib("stdlib/include/ms_transform.hrl").
+
+t() ->
+    MS = dbg:fun2ms(fun(All) -> message(All) end),
+    erlang:trace_pattern({m, f, '_'}, MS).