diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-02-07 11:30:13 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-02-07 11:30:13 +0100 |
| commit | 76181f2e146dea3638e70a8636690ab8b4397c70 (patch) | |
| tree | 0db0d57e210b7aefe5b451e690117c2d625dd88a /erts/emulator/beam/ops.tab | |
| parent | 60246d149deef631366bdca8605a8cf323427cc7 (diff) | |
| parent | b31a985383d1d641b4d05439c9e30a2f5958dd93 (diff) | |
| download | otp-76181f2e146dea3638e70a8636690ab8b4397c70.tar.gz otp-76181f2e146dea3638e70a8636690ab8b4397c70.tar.bz2 otp-76181f2e146dea3638e70a8636690ab8b4397c70.zip | |
Merge branch 'egil/erts/fix-maps-beam_load'
* egil/erts/fix-maps-beam_load:
compiler: Update map_SUITE with error case test
erts: Maps must fail on exact updates of empty Maps
erts: Fix Maps for beam_load
Diffstat (limited to 'erts/emulator/beam/ops.tab')
| -rw-r--r-- | erts/emulator/beam/ops.tab | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index f35997efee..9ea3a3a8ea 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -1482,8 +1482,8 @@ put_map_exact F Src Dst Live Size Rest=* => \ update_map_exact F Src Dst Live Size Rest new_map j d I I -update_map_assoc j d d I I -update_map_exact j d d I I +update_map_assoc j s d I I +update_map_exact j s d I I is_map Fail cq => jump Fail |