diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-05-11 11:16:14 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-05-11 11:16:14 +0200 |
| commit | ccb1a2f06aa2b0ab77447572797d7fd75b2bd3c4 (patch) | |
| tree | 50f7ba5c099efead21973b6cb5cd4f819d5243e2 /erts/emulator/beam/copy.c | |
| parent | 4fc828ad916a5f3eedeea55ec7a6e7ea169fa46b (diff) | |
| parent | b51bbf8b8a06e7bf18e0b837f50dad4a66a0fca7 (diff) | |
| download | otp-ccb1a2f06aa2b0ab77447572797d7fd75b2bd3c4.tar.gz otp-ccb1a2f06aa2b0ab77447572797d7fd75b2bd3c4.tar.bz2 otp-ccb1a2f06aa2b0ab77447572797d7fd75b2bd3c4.zip | |
Merge branch 'egil/fix-maps-copy-shallow'
* egil/fix-maps-copy-shallow:
erts: Make hashmap_get halfword safe
erts: Fix ETS db_has_variable check for large Maps
stdlib: Strengthen ETS Maps tests
erts: Fix copy shallow for large Maps
stdlib: Strengthen ETS Maps tests
erts: ETS ordered_set cannot use it's optimization with Maps
stdlib: Strengthen ETS Maps tests
stdlib: Refactor away ?line macro
Diffstat (limited to 'erts/emulator/beam/copy.c')
| -rw-r--r-- | erts/emulator/beam/copy.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c index 4d12dae787..850606dd86 100644 --- a/erts/emulator/beam/copy.c +++ b/erts/emulator/beam/copy.c @@ -608,11 +608,6 @@ Eterm copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap) erts_refc_inc(&funp->fe->refc, 2); } goto off_heap_common; - - case MAP_SUBTAG: - *hp++ = *tp++; - sz--; - break; case EXTERNAL_PID_SUBTAG: case EXTERNAL_PORT_SUBTAG: case EXTERNAL_REF_SUBTAG: @@ -648,7 +643,6 @@ Eterm copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap) } } *hpp = hp; - return res; } |