diff options
author | Björn Gustavsson <[email protected]> | 2017-08-15 13:34:45 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2017-08-15 15:56:09 +0200 |
commit | 17bb6bfa8d435300ee2205f1e0c20b0c6b50591a (patch) | |
tree | 0653a31031c4f17dd65d8ff3d6f19594cd1788cd /erts/emulator/beam/beam_debug.c | |
parent | 589b8769a01511f1e95f8e6aab301aa5c223bc09 (diff) | |
download | otp-17bb6bfa8d435300ee2205f1e0c20b0c6b50591a.tar.gz otp-17bb6bfa8d435300ee2205f1e0c20b0c6b50591a.tar.bz2 otp-17bb6bfa8d435300ee2205f1e0c20b0c6b50591a.zip |
Slightly optimize updating of maps
The instruction put_map_assoc/5 (used for updating a map) has a
failure operand, but it can't actually fail provided that its "map"
argument is a map.
The following code:
M#{key=>value}.
will be compiled to:
{test,is_map,{f,3},[{x,0}]}.
{line,[...]}.
{put_map_assoc,{f,0},{x,0},{x,0},1,{list,[{atom,key},{atom,value}]}}.
return.
{label,3}.
%% Code that produces a 'badmap' exception follows.
Because of the is_map instruction, {x,0} always contains a map when
the put_map_assoc instruction is executed. Therefore we can remove
the failure operand. That will save one word, and also eliminate
two tests at run-time.
The only problem is that the compiler in OTP 17 did not emit a
is_map instruction before the put_map_assoc instruction. Therefore,
we must add an instruction that tests for a map if the code was
compiled with the OTP 17 compiler.
Unfortunately, there is no safe and relatively easy way to known that
the OTP 17 compiler was used, so we will check whether a compiler
before OTP 20 was used. OTP 20 introduced a new chunk type for atoms,
which is trivial to check.
Diffstat (limited to 'erts/emulator/beam/beam_debug.c')
-rw-r--r-- | erts/emulator/beam/beam_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c index fa912e52e9..afe87288ce 100644 --- a/erts/emulator/beam/beam_debug.c +++ b/erts/emulator/beam/beam_debug.c @@ -697,7 +697,7 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr) case op_i_put_tuple_xI: case op_i_put_tuple_yI: case op_new_map_dII: - case op_update_map_assoc_jsdII: + case op_update_map_assoc_sdII: case op_update_map_exact_jsdII: { int n = unpacked[-1]; |