aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-26 09:56:47 +0200
committerJohn Högberg <[email protected]>2018-07-26 09:56:47 +0200
commitd9d694ca3ea8a168c51145fc485a3bcbc18f6188 (patch)
tree3ae824615ddadabdbeae2679b1aa4f717195b4b8 /erts/emulator/beam
parentd7e303cb7981e2ceb0eb0074cf7402feec5da868 (diff)
parenta0b2cc0a377d780fe938ba9be3e417c7a8e00914 (diff)
downloadotp-d9d694ca3ea8a168c51145fc485a3bcbc18f6188.tar.gz
otp-d9d694ca3ea8a168c51145fc485a3bcbc18f6188.tar.bz2
otp-d9d694ca3ea8a168c51145fc485a3bcbc18f6188.zip
Merge branch '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.