diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-02-03 11:29:33 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-02-03 11:29:33 +0100 |
| commit | 52e15d7460bb277dec7fa01a58c6b85df47640ae (patch) | |
| tree | ed672c8214d33881ffe6db565f52ccb5ff467e5e /lib/compiler/src/beam_disasm.erl | |
| parent | eec1d22c5aef21ad4606c79465084bbff46d42ee (diff) | |
| parent | bc31418123c5abbdb2d2c3d3d5e4bfc53b5c7d26 (diff) | |
| download | otp-52e15d7460bb277dec7fa01a58c6b85df47640ae.tar.gz otp-52e15d7460bb277dec7fa01a58c6b85df47640ae.tar.bz2 otp-52e15d7460bb277dec7fa01a58c6b85df47640ae.zip | |
Merge branch 'egil/compiler/strengthen-tests'
* egil/compiler/strengthen-tests:
compiler: Teach beam_disasm has_map_field instruction
compiler: Fold binary Map key patterns to literals
compiler: Strengthen listings tests
compiler: Strengthen Maps tests
Diffstat (limited to 'lib/compiler/src/beam_disasm.erl')
| -rw-r--r-- | lib/compiler/src/beam_disasm.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl index e0d0d0fd1d..57fdf95677 100644 --- a/lib/compiler/src/beam_disasm.erl +++ b/lib/compiler/src/beam_disasm.erl @@ -1134,7 +1134,7 @@ resolve_inst({line,[Index]},_,_,_) -> {line,resolve_arg(Index)}; %% -%% R17A. +%% 17.0 %% resolve_inst({put_map_assoc,Args},_,_,_) -> [FLbl,Src,Dst,{u,N},{{z,1},{u,_Len},List0}] = Args, @@ -1150,6 +1150,10 @@ resolve_inst({is_map,Args0},_,_,_) -> [FLbl|Args] = resolve_args(Args0), {test, is_map, FLbl, Args}; +resolve_inst({has_map_field,Args0},_,_,_) -> + [FLbl|Args] = resolve_args(Args0), + {test,has_map_field,FLbl,Args}; + resolve_inst({get_map_element,Args},_,_,_) -> [FLbl,Src,Key,Dst] = resolve_args(Args), {get_map_element,FLbl,Src,Key,Dst}; |