diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-02-21 11:39:07 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-02-21 11:39:07 +0100 |
| commit | 2d3c60dbd941ac4408488414b6e8434405ad24a5 (patch) | |
| tree | 19d6f56c13b5068ada890b8050ce6576a64d4f54 /lib/compiler/src/genop.tab | |
| parent | 2b7d4bebe6d7ecf79d78ead792237a458798be5f (diff) | |
| parent | 1c37990e06a4588b941f430f872ad45001b63844 (diff) | |
| download | otp-2d3c60dbd941ac4408488414b6e8434405ad24a5.tar.gz otp-2d3c60dbd941ac4408488414b6e8434405ad24a5.tar.bz2 otp-2d3c60dbd941ac4408488414b6e8434405ad24a5.zip | |
Merge branch 'egil/compiler/maps-get_map_elements'
* egil/compiler/maps-get_map_elements:
compiler: Strengthen Maps compile tests
compiler: Remove dead warning
erts: Fix erts_debug:disassemble/1
compiler: Transform list of Args to exact literal type
compiler: Test Maps aliasing
compiler: Use aliasing in map pair patterns
compiler: Check literal order in beam_validator
erts: Introduce new instructions for combined key fetches
compiler: Change map instructions for fetching values
Diffstat (limited to 'lib/compiler/src/genop.tab')
| -rwxr-xr-x | lib/compiler/src/genop.tab | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab index 79b467f949..7d6bf56ccb 100755 --- a/lib/compiler/src/genop.tab +++ b/lib/compiler/src/genop.tab @@ -529,10 +529,10 @@ BEAM_FORMAT_NUMBER=0 153: line/1 -# R16 +# R17 154: put_map_assoc/5 155: put_map_exact/5 156: is_map/2 -157: has_map_field/3 -158: get_map_element/4 +157: has_map_fields/3 +158: get_map_elements/3 |