File 0721-Eliminate-compiler-crash-in-beam_ssa_codeg... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0721-Eliminate-compiler-crash-in-beam_ssa_codegen.patch of Package erlang (Revision 70b2d07037c143e87423048b386444cf)

Currently displaying revision 70b2d07037c143e87423048b386444cf , Show latest

From d25bf59b5aea489e770b9ac0228eaa5b2998191d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 26 Apr 2023 05:21:15 +0200
Subject: [PATCH] Eliminate compiler crash in beam_ssa_codegen

Closes #7170
---
 lib/compiler/src/beam_ssa_codegen.erl |  6 ++++
 lib/compiler/test/bif_SUITE.erl       | 43 +++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/lib/compiler/src/beam_ssa_codegen.erl b/lib/compiler/src/beam_ssa_codegen.erl
index c4708e9b11..9f6169829b 100644
--- a/lib/compiler/src/beam_ssa_codegen.erl
+++ b/lib/compiler/src/beam_ssa_codegen.erl
@@ -1450,6 +1450,12 @@ cg_copy_1([], _St) -> [].
                           element(1, Val) =:= atom orelse
                           element(1, Val) =:= literal)).
 
+bif_to_test(min, Args, Fail, St) ->
+    %% The min/2 and max/2 BIFs can only be rewritten to tests when
+    %% both arguments are known to be booleans.
+    bif_to_test('and', Args, Fail, St);
+bif_to_test(max, Args, Fail, St) ->
+    bif_to_test('or', Args, Fail, St);
 bif_to_test('or', [V1,V2], {f,Lbl}=Fail, St0) when Lbl =/= 0 ->
     {SuccLabel,St} = new_label(St0),
     {[{test,is_eq_exact,{f,SuccLabel},[V1,{atom,false}]},
diff --git a/lib/compiler/test/bif_SUITE.erl b/lib/compiler/test/bif_SUITE.erl
index fc1d9ddfc0..e58db29114 100644
--- a/lib/compiler/test/bif_SUITE.erl
+++ b/lib/compiler/test/bif_SUITE.erl
@@ -24,7 +24,8 @@
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 beam_validator/1,trunc_and_friends/1,cover_safe_and_pure_bifs/1,
-         cover_trim/1]).
+         cover_trim/1,
+         min_max/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
@@ -33,11 +34,12 @@ all() ->
     [{group,p}].
 
 groups() ->
-    [{p,[parallel],
+    [{p,test_lib:parallel(),
       [beam_validator,
        trunc_and_friends,
        cover_safe_and_pure_bifs,
-       cover_trim
+       cover_trim,
+       min_max
       ]}].
 
 init_per_suite(Config) ->
@@ -138,5 +140,40 @@ cover_trim_1(Something, V) ->
             ok
     end.
 
+min_max(_Config) ->
+    False = id(false),
+    True = id(true),
+
+    false = bool_min_false(False, False),
+    false = bool_min_false(False, True),
+    false = bool_min_false(True, False),
+    true = bool_min_true(True, True),
+
+    false = bool_max_false(False, False),
+    true = bool_max_true(False, True),
+    true = bool_max_true(True, False),
+    true = bool_max_true(True, True),
+
+    ok.
+
+%% GH-7170: The following functions would cause a crash in
+%% beam_ssa_codegen.
+
+bool_min_false(A, B) when is_boolean(A), is_boolean(B) ->
+    false = min(A, B).
+
+bool_min_true(A, B) when is_boolean(A), is_boolean(B) ->
+    true = min(A, B).
+
+bool_max_false(A, B) when is_boolean(A), is_boolean(B) ->
+    false = max(A, B).
+
+bool_max_true(A, B) when is_boolean(A), is_boolean(B) ->
+    true = max(A, B).
+
+%%%
+%%% Common utilities.
+%%%
+
 id(I) ->
     I.
-- 
2.35.3

Places

File 0721-Eliminate-compiler-crash-in-beam_ssa_codegen.patch of Package erlang (Revision 70b2d07037c143e87423048b386444cf)

Places