diff options
| author | Magnus Lång <[email protected]> | 2015-10-23 17:09:16 +0200 |
|---|---|---|
| committer | Magnus Lång <[email protected]> | 2015-11-27 18:18:38 +0100 |
| commit | 148153eb16e873181ff6961f854105a240989265 (patch) | |
| tree | 307202287cc27ab559e18675667a9a508a0e4559 /lib/hipe/cerl/cerl_to_icode.erl | |
| parent | fd21382290333e6cc25728c1b6dd7c211ddfc297 (diff) | |
| download | otp-148153eb16e873181ff6961f854105a240989265.tar.gz otp-148153eb16e873181ff6961f854105a240989265.tar.bz2 otp-148153eb16e873181ff6961f854105a240989265.zip | |
hipe: test unit size match in bs_put_binary_all
The unit size field was previously completely discarded when lowering
this instruction from BEAM to Icode.
This feature was previously missing and expressions such as <<0,
<<1:1>>/binary>> would succeed construction when compiled with HiPE.
Diffstat (limited to 'lib/hipe/cerl/cerl_to_icode.erl')
| -rw-r--r-- | lib/hipe/cerl/cerl_to_icode.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/hipe/cerl/cerl_to_icode.erl b/lib/hipe/cerl/cerl_to_icode.erl index 97b95f2e7c..ab131c2d01 100644 --- a/lib/hipe/cerl/cerl_to_icode.erl +++ b/lib/hipe/cerl/cerl_to_icode.erl @@ -794,9 +794,9 @@ bitstr_gen_op([V], #ctxt{fail=FL, class=guard}, SizeInfo, ConstInfo, Type, Flags, Base, Offset) -> SL = new_label(), case SizeInfo of - {all,_NewUnit, NewAlign, S1} -> + {all, NewUnit, NewAlign, S1} -> Type = binary, - Name = {bs_put_binary_all, Flags}, + Name = {bs_put_binary_all, NewUnit, Flags}, Primop = {hipe_bs_primop, Name}, {add_code([icode_guardop([Offset], Primop, [V, Base, Offset], SL, FL), @@ -819,9 +819,9 @@ bitstr_gen_op([V], #ctxt{fail=FL, class=guard}, SizeInfo, ConstInfo, bitstr_gen_op([V], _Ctxt, SizeInfo, ConstInfo, Type, Flags, Base, Offset) -> case SizeInfo of - {all, _NewUnit, NewAlign, S} -> + {all, NewUnit, NewAlign, S} -> Type = binary, - Name = {bs_put_binary_all, Flags}, + Name = {bs_put_binary_all, NewUnit, Flags}, Primop = {hipe_bs_primop, Name}, {add_code([icode_call_primop([Offset], Primop, [V, Base, Offset])], S), |