-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'bjorn/erts/bs-construction/GH-8238/OTP-19021' into maint
* bjorn/erts/bs-construction/GH-8238/OTP-19021: AArch64: Fix crash for running bit syntax code compiled by OTP 24 AArch64: Fix incorrect result for running code compiled by OTP 24
- Loading branch information
Showing
6 changed files
with
97 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -152,6 +152,7 @@ NO_OPT= bs_bincomp \ | |
map | ||
|
||
R24= \ | ||
bs_construct \ | ||
process_max_heap_size | ||
|
||
R25= \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
erts/emulator/test/bs_construct_SUITE_data/otp_24_code_gh_8238.S
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
{module, otp_24_code_gh_8238}. %% version = 0 | ||
|
||
{exports, [{module_info,0},{module_info,1},{otp_24_code_gh_8238,0}]}. | ||
|
||
{attributes, []}. | ||
|
||
{labels, 7}. | ||
|
||
|
||
{function, otp_24_code_gh_8238, 0, 2}. | ||
{label,1}. | ||
{line,[{location,"otp_24_code_gh_8238.erl",4}]}. | ||
{func_info,{atom,otp_24_code_gh_8238},{atom,otp_24_code_gh_8238},0}. | ||
{label,2}. | ||
{allocate,0,0}. | ||
{move,{integer,1000},{x,0}}. | ||
{line,[{location,"otp_24_code_gh_8238.erl",5}]}. | ||
{call_ext,1,{extfunc,erlang,integer_to_binary,1}}. | ||
{line,[{location,"otp_24_code_gh_8238.erl",6}]}. | ||
{gc_bif,byte_size,{f,0},1,[{x,0}],{x,1}}. | ||
{bs_add,{f,0},[{x,1},{integer,9},1],{x,1}}. | ||
{bs_init2,{f,0},{x,1},2,2,{field_flags,[]},{x,1}}. | ||
{bs_put_integer,{f,0}, | ||
{integer,72}, | ||
1, | ||
{field_flags,[unsigned,big]}, | ||
{integer,1281499675772873685536}}. | ||
{bs_put_binary,{f,0},{atom,all},8,{field_flags,[unsigned,big]},{x,0}}. | ||
{put_list,{x,1},nil,{x,1}}. | ||
{move,{literal,"~p\n"},{x,0}}. | ||
{call_ext_last,2,{extfunc,io,format,2},0}. | ||
|
||
|
||
{function, module_info, 0, 4}. | ||
{label,3}. | ||
{line,[]}. | ||
{func_info,{atom,otp_24_code_gh_8238},{atom,module_info},0}. | ||
{label,4}. | ||
{move,{atom,otp_24_code_gh_8238},{x,0}}. | ||
{call_ext_only,1,{extfunc,erlang,get_module_info,1}}. | ||
|
||
|
||
{function, module_info, 1, 6}. | ||
{label,5}. | ||
{line,[]}. | ||
{func_info,{atom,otp_24_code_gh_8238},{atom,module_info},1}. | ||
{label,6}. | ||
{move,{x,0},{x,1}}. | ||
{move,{atom,otp_24_code_gh_8238},{x,0}}. | ||
{call_ext_only,2,{extfunc,erlang,get_module_info,2}}. |
10 changes: 10 additions & 0 deletions
10
erts/emulator/test/bs_construct_SUITE_data/otp_24_code_gh_8238.erl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
-module(otp_24_code_gh_8238). | ||
-export([?MODULE/0]). | ||
|
||
%% Produce otp_24_code_gh_8238.S using Erlang/OTP 24 like this: | ||
%% erlc -S +no_copt +no_ssa_opt otp_24_code_gh_8238.erl | ||
|
||
?MODULE() -> | ||
Bin = integer_to_binary(1000), | ||
io:format("~p\n", [<<"Example: ", Bin/binary>>]). | ||
|