Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

beam_core_to_ssa: Ensure {succeeded,guard} is used in guard context #8824

Merged
merged 1 commit into from
Oct 2, 2024
Merged

beam_core_to_ssa: Ensure {succeeded,guard} is used in guard context #8824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ JAVADOC-GENERATED
/lib/compiler/src/beam_opcodes.hrl
/lib/compiler/src/core_parse.erl

/lib/compiler/test/*_no_bool_opt_SUITE.erl
/lib/compiler/test/*_no_opt_SUITE.erl
/lib/compiler/test/*_no_copt_SUITE.erl
/lib/compiler/test/*_no_copt_ssa_SUITE.erl
Expand Down
4 changes: 4 additions & 0 deletions lib/compiler/src/beam_core_to_ssa.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2760,6 +2760,10 @@ guard_cg(#cg_seq{arg=Arg,body=Body}, Fail, St0) ->
{ArgIs,St1} = guard_cg(Arg, Fail, St0),
{BodyIs,St} = guard_cg(Body, Fail, St1),
{ArgIs++BodyIs,St};
guard_cg(#cg_succeeded{set=Set0}, Fail, St0) ->
{[#b_set{dst=Dst}=Set],St1} = cg(Set0, St0),
{Is,St} = make_succeeded(Dst, {guard, Fail}, St1),
{[Set|Is],St};
guard_cg(G, _Fail, St) ->
cg(G, St).

Expand Down
26 changes: 21 additions & 5 deletions lib/compiler/test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ MODULES= \
z_SUITE \
test_lib

NO_BOOL_OPT= \
guard \
andor

NO_OPT= \
andor \
apply \
Expand Down Expand Up @@ -132,6 +136,8 @@ NO_SSA_OPT = $(NO_OPT)

NO_TYPE_OPT = $(NO_OPT)

NO_BOOL_OPT_MODULES= $(NO_BOOL_OPT:%=%_no_bool_opt_SUITE)
NO_BOOL_OPT_ERL_FILES= $(NO_BOOL_OPT_MODULES:%=%.erl)
NO_OPT_MODULES= $(NO_OPT:%=%_no_opt_SUITE)
NO_OPT_ERL_FILES= $(NO_OPT_MODULES:%=%.erl)
POST_OPT_MODULES= $(NO_OPT:%=%_post_opt_SUITE)
Expand Down Expand Up @@ -185,12 +191,16 @@ EBIN = .

DISABLE_SSA_OPT = +no_bool_opt +no_share_opt +no_bsm_opt +no_fun_opt +no_ssa_opt +no_recv_opt

make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) $(NO_SSA_OPT_ERL_FILES) \
$(NO_CORE_OPT_ERL_FILES) $(NO_CORE_SSA_OPT_ERL_FILES) \
$(INLINE_ERL_FILES) $(NO_MOD_OPT_ERL_FILES) $(NO_TYPE_OPT_ERL_FILES) \
$(DIALYZER_ERL_FILES) $(COVER_ERL_FILES) $(R25_ERL_FILES)
make_emakefile: $(NO_BOOL_OPT_ERL_FILES) $(NO_OPT_ERL_FILES) \
$(POST_OPT_ERL_FILES) $(NO_SSA_OPT_ERL_FILES) \
$(NO_CORE_OPT_ERL_FILES) $(NO_CORE_SSA_OPT_ERL_FILES) \
$(INLINE_ERL_FILES) $(NO_MOD_OPT_ERL_FILES) \
$(NO_TYPE_OPT_ERL_FILES) $(DIALYZER_ERL_FILES) \
$(COVER_ERL_FILES) $(R25_ERL_FILES)
$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
> $(EMAKEFILE)
$(ERL_TOP)/make/make_emakefile +no_bool_opt $(ERL_COMPILE_FLAGS) \
-o$(EBIN) $(NO_BOOL_OPT_MODULES) >> $(EMAKEFILE)
$(ERL_TOP)/make/make_emakefile +no_copt $(DISABLE_SSA_OPT) +no_postopt \
$(ERL_COMPILE_FLAGS) -o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE)
$(ERL_TOP)/make/make_emakefile $(DISABLE_SSA_OPT) $(ERL_COMPILE_FLAGS) \
Expand Down Expand Up @@ -230,6 +240,9 @@ docs:
# Special targets
# ----------------------------------------------------

%_no_bool_opt_SUITE.erl: %_SUITE.erl
sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@

%_no_opt_SUITE.erl: %_SUITE.erl
sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@

Expand Down Expand Up @@ -274,7 +287,10 @@ release_tests_spec: make_emakefile
$(INSTALL_DIR) "$(RELSYSDIR)"
$(INSTALL_DATA) compiler.spec compiler.cover \
$(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
$(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) \
$(INSTALL_DATA) \
$(NO_BOOL_OPT_ERL_FILES) \
$(NO_OPT_ERL_FILES) \
$(POST_OPT_ERL_FILES) \
$(INLINE_ERL_FILES) \
$(R25_ERL_FILES) \
$(NO_CORE_OPT_ERL_FILES) \
Expand Down
17 changes: 15 additions & 2 deletions lib/compiler/test/guard_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
bad_constants/1,bad_guards/1,
guard_in_catch/1,beam_bool_SUITE/1,
repeated_type_tests/1,use_after_branch/1]).
repeated_type_tests/1,use_after_branch/1,
body_in_guard/1]).

suite() -> [{ct_hooks,[ts_install_cth]}].

Expand All @@ -60,7 +61,7 @@ groups() ->
basic_andalso_orelse,traverse_dcd,
check_qlc_hrl,andalso_semi,t_tuple_size,binary_part,
bad_constants,bad_guards,guard_in_catch,beam_bool_SUITE,
repeated_type_tests,use_after_branch]},
repeated_type_tests,use_after_branch,body_in_guard]},
{slow,[],[literal_type_tests,generated_combinations]}].

init_per_suite(Config) ->
Expand Down Expand Up @@ -3348,6 +3349,18 @@ use_after_branch_1(A) ->
false -> {id(Boolean), gaffel}
end.

%% GH-8733: Benign bug where {succeeded,body} was emitted in a guard context,
%% crashing the compiler when +no_bool_opt was specified.
body_in_guard(_Config) ->
Pid = self(),
Mon = monitor(process, Pid),
receive
{'DOWN', Mon, process, Pid, _} ->
ok
after 0 ->
demonitor(Mon)
end.

%% Call this function to turn off constant propagation.
id(I) -> I.

Expand Down
Loading