aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-05-12 16:44:24 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-05-12 16:44:24 +0200
commit614bca0f5832f06bcc181c58b78e3371d79ec40d (patch)
treebeb8d9d41d986641cbfdd116b358d6bd15aa9fe4 /erts/preloaded/src
parentc563f5866b42a3479050241284fffc1245aebe7d (diff)
parente1d5e4841a657ad26254597dc8f2bb09a38c6646 (diff)
downloadotp-614bca0f5832f06bcc181c58b78e3371d79ec40d.tar.gz
otp-614bca0f5832f06bcc181c58b78e3371d79ec40d.tar.bz2
otp-614bca0f5832f06bcc181c58b78e3371d79ec40d.zip
Merge branch 'egil/fix-erts_debug-size/OTP-11923' into maint
* egil/fix-erts_debug-size/OTP-11923: erts: Update preloaded erts_internal.beam erts: Add spec for erts_internal:map_to_tuple_keys/1 erts: Add testcase for erts_debug:size/1 Map terms kernel: Fix erts_debug:size/1 to handle Map sizes erts: Add erts_internal:map_to_tuple_keys/1
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/erts_internal.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index edcd50c77e..764d7730aa 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -31,6 +31,7 @@
-export([await_port_send_result/3]).
-export([binary_to_term/1, binary_to_term/2]).
-export([cmp_term/2]).
+-export([map_to_tuple_keys/1]).
-export([port_command/3, port_connect/2, port_close/1,
port_control/3, port_call/3, port_info/1, port_info/2]).
@@ -181,3 +182,11 @@ binary_to_term(_Binary, _Opts) ->
cmp_term(_A,_B) ->
erlang:nif_error(undefined).
+
+%% return the internal key tuple for map keys
+-spec map_to_tuple_keys(M) -> Keys when
+ M :: map(),
+ Keys :: tuple().
+
+map_to_tuple_keys(_M) ->
+ erlang:nif_error(undefined).