diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-12-08 15:15:17 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-12-08 15:15:17 +0100 |
| commit | b9a239c3a5c33819f4539380e8e8f6e8cce95072 (patch) | |
| tree | 90fb90804e4dd69796188567a03a8523afe182a3 /lib | |
| parent | 40beec43a477062dc81c4dd29eb9dc6a1db0ee9a (diff) | |
| parent | 4f3212c9a84e6feaea1bbffdc1972e4760cc7815 (diff) | |
| download | otp-b9a239c3a5c33819f4539380e8e8f6e8cce95072.tar.gz otp-b9a239c3a5c33819f4539380e8e8f6e8cce95072.tar.bz2 otp-b9a239c3a5c33819f4539380e8e8f6e8cce95072.zip | |
Merge branch 'egil/term_type/OTP-13172'
* egil/term_type/OTP-13172:
Test erts_internal:term_type/1
erts: Let term_type/1 encompass all types
erts: Change erts_internal:map_type/1 into term_type/1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/erts_debug.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl index 87f001fdf4..8e2b5ad214 100644 --- a/lib/kernel/src/erts_debug.erl +++ b/lib/kernel/src/erts_debug.erl @@ -243,7 +243,7 @@ map_size(Map,Seen0,Sum0) -> %% is not allowed to leak anywhere. They are only allowed in %% containers (cons cells and tuples, not maps), in gc and %% in erts_debug:same/2 - case erts_internal:map_type(Map) of + case erts_internal:term_type(Map) of flatmap -> Kt = erts_internal:map_to_tuple_keys(Map), Vs = maps:values(Map), |