Merge branch 'bjorn/compiler/binary-matching/OTP-10567' into maint

* bjorn/compiler/binary-matching/OTP-10567:
  Fix compiler crash for binary matching and a complicated guard

1 files changed, 17 insertions, 0 deletions

diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index 01b7568122..313de3470c 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -800,12 +800,29 @@ matching_and_andalso(Config) when is_list(Config) ->
     ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, -8)),
     ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, blurf)),
     ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, 19)),
+
+    {"abc",<<"xyz">>} = matching_and_andalso_2("abc", <<"-xyz">>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($a-1)>>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($z+1)>>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($A-1)>>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($Z+1)>>),
+    error = matching_and_andalso_2([], <<>>),
+    error = matching_and_andalso_2([], <<$A>>),
+    error = matching_and_andalso_2([], <<$Z>>),
+    error = matching_and_andalso_2([], <<$a>>),
+    error = matching_and_andalso_2([], <<$z>>),
     ok.
 
 matching_and_andalso_1(<<Bitmap/binary>>, K)
   when is_integer(K) andalso size(Bitmap) >= K andalso 0 < K ->
     ok.
 
+matching_and_andalso_2(Datetime, <<H,T/binary>>)
+  when not ((H >= $a) andalso (H =< $z)) andalso
+       not ((H >= $A) andalso (H =< $Z)) ->
+    {Datetime,T};
+matching_and_andalso_2(_, _) -> error.
+
 %% Thanks to Tomas Stejskal.
 otp_7188(Config) when is_list(Config) ->
     MP3 = <<84,65,71,68,117,154,105,232,107,121,0,0,0,0,0,0,0,0,0,0,