aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-26 09:56:21 +0200
committerJohn Högberg <[email protected]>2018-07-26 09:56:21 +0200
commita0b2cc0a377d780fe938ba9be3e417c7a8e00914 (patch)
tree0d5714d31e6c67faeaaab6f76351bf3bec4a8591 /erts/emulator/beam
parentf678e1b71987075cfd7816da7e7dd828ea630115 (diff)
parent4664de710ded469916fcc8f85d4e9791adc319e9 (diff)
downloadotp-a0b2cc0a377d780fe938ba9be3e417c7a8e00914.tar.gz
otp-a0b2cc0a377d780fe938ba9be3e417c7a8e00914.tar.bz2
otp-a0b2cc0a377d780fe938ba9be3e417c7a8e00914.zip
Merge branch 'maint-21' into maint
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/ops.tab5
1 files changed, 1 insertions, 4 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 88ede3bb60..c51e4ef784 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -1421,16 +1421,13 @@ get_map_elements Fail Src Size Rest=* | map_key_sort(Size, Rest) => \
i_get_map_elements f? s I
-i_get_map_element Fail Src=xy Key=y Dst => \
- move Key x | i_get_map_element Fail Src x Dst
-
i_get_map_element_hash Fail Src=c Key Hash Dst => \
move Src x | i_get_map_element_hash Fail x Key Hash Dst
i_get_map_element_hash f? xy c I xy
i_get_map_element Fail Src=c Key Dst => \
move Src x | i_get_map_element Fail x Key Dst
-i_get_map_element f? xy x xy
+i_get_map_element f? xy xy xy
#
# Convert the plus operations to a generic plus instruction.