aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-03-21 10:06:10 +0100
committerBjörn Gustavsson <[email protected]>2018-03-21 10:06:10 +0100
commit2c5711efcdd48ab8a9b7cd9ae27c97b9c1f8c37e (patch)
treec57a003fb9902c58008d21f6630efeb80209b04c /lib/compiler/src
parentf975e76672a8faabe6e9652df7ad743f148ceeb3 (diff)
parent2371741165a0f6c39893fe9f586d7586fd7d02a1 (diff)
downloadotp-2c5711efcdd48ab8a9b7cd9ae27c97b9c1f8c37e.tar.gz
otp-2c5711efcdd48ab8a9b7cd9ae27c97b9c1f8c37e.tar.bz2
otp-2c5711efcdd48ab8a9b7cd9ae27c97b9c1f8c37e.zip
Merge branch 'bjorn/misc-beam-fixes'
* bjorn/misc-beam-fixes: Correctly handle get_map_elements with a literal map core_parse: Fix handling of negative sizes in binaries
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/core_parse.yrl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/compiler/src/core_parse.yrl b/lib/compiler/src/core_parse.yrl
index 79a7cccd98..85444023c6 100644
--- a/lib/compiler/src/core_parse.yrl
+++ b/lib/compiler/src/core_parse.yrl
@@ -496,7 +496,7 @@ make_lit_bin(Acc, [#c_bitstr{val=I0,size=Sz0,unit=U0,type=Type0,flags=F0}|T]) ->
throw(impossible)
end,
if
- Sz =< 8, T =:= [] ->
+ 0 =< Sz, Sz =< 8, T =:= [] ->
<<Acc/binary,I:Sz>>;
Sz =:= 8 ->
make_lit_bin(<<Acc/binary,I:8>>, T);