diff options
| author | Rickard Green <[email protected]> | 2019-01-22 19:51:06 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-22 19:51:06 +0100 |
| commit | 5cd9c35347941b2af477c6b3847894f8b360f47f (patch) | |
| tree | 0510b36a11a530342a1cd38d5dccee6204173233 | |
| parent | 71c276be5d0a4bf60158137ae3c2be970216429b (diff) | |
| parent | e96f66d8817d89c51b5066ed0cd69fcda8620306 (diff) | |
| download | otp-5cd9c35347941b2af477c6b3847894f8b360f47f.tar.gz otp-5cd9c35347941b2af477c6b3847894f8b360f47f.tar.bz2 otp-5cd9c35347941b2af477c6b3847894f8b360f47f.zip | |
Merge pull request #2089 from richcarl/document-undefined-current_function
Document that current_function can be undefined
OTP-15543
| -rw-r--r-- | erts/doc/src/erlang.xml | 6 | ||||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index aba6082647..92e979c046 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -5186,11 +5186,13 @@ RealSystem = system + MissedSystem</code> changed or removed without prior notice.</p> </item> <tag><c>{current_function, {<anno>Module</anno>, - <anno>Function</anno>, Arity}}</c></tag> + <anno>Function</anno>, Arity} | undefined}</c></tag> <item> <p><c><anno>Module</anno></c>, <c><anno>Function</anno></c>, <c><anno>Arity</anno></c> is - the current function call of the process.</p> + the current function call of the process. The value + <c>undefined</c> can be returned if the process is + currently executing native compiled code.</p> </item> <tag><c>{current_location, {<anno>Module</anno>, <anno>Function</anno>, <anno>Arity</anno>, diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 65716def11..a5b60cc845 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2295,7 +2295,7 @@ process_flag(_Flag, _Value) -> non_neg_integer()}]} | {catchlevel, CatchLevel :: non_neg_integer()} | {current_function, - {Module :: module(), Function :: atom(), Arity :: arity()}} | + {Module :: module(), Function :: atom(), Arity :: arity()} | undefined} | {current_location, {Module :: module(), Function :: atom(), Arity :: arity(), Location :: [{file, Filename :: string()} | % not a stack_item()! |