aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-08 15:13:02 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-08 15:13:02 +0200
commit01ac0d2cb316b97834eb1dbbe4a86d2a6be84f04 (patch)
treef3663bb8d6ef3a1f5af73e444dad88c8e0de0d95 /erts
parentcb37a1e06d0d7d9b7721604eaaa55a45e234162b (diff)
parentc508d0219aebe341805fb747581ec304975d62ea (diff)
downloadotp-01ac0d2cb316b97834eb1dbbe4a86d2a6be84f04.tar.gz
otp-01ac0d2cb316b97834eb1dbbe4a86d2a6be84f04.tar.bz2
otp-01ac0d2cb316b97834eb1dbbe4a86d2a6be84f04.zip
Merge branch 'egil/erts/fix-process_info-spec/ERL-123/OTP-13485'
* egil/erts/fix-process_info-spec/ERL-123/OTP-13485: Update preloaded erlang.beam erts: Fix process_info/2 result spec
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/erlang.beambin102200 -> 102316 bytes
-rw-r--r--erts/preloaded/src/erlang.erl2
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 2ea2de4c70..7ceb6daaa3 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index dfbd116d6e..50b01703ac 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2130,7 +2130,7 @@ process_flag(_Flag, _Value) ->
{message_queue_data, MQD :: message_queue_data()} |
{priority, Level :: priority_level()} |
{reductions, Number :: non_neg_integer()} |
- {registered_name, Atom :: atom()} |
+ {registered_name, [] | (Atom :: atom())} |
{sequential_trace_token, [] | (SequentialTraceToken :: term())} |
{stack_size, Size :: non_neg_integer()} |
{status, Status :: exiting | garbage_collecting | waiting | running | runnable | suspended} |