From 2da980f03b0f67b1e8e15cb65049a90e3de401c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 6 Nov 2012 09:20:02 +0100
Subject: Fix compiler crash for binary matching and a complicated guard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The compiler would crash when attempting to compile a function
head that did binary matching and had a complex expression using
'andalso' and 'not'.

Noticed-by: José Valim
---
 lib/compiler/src/v3_codegen.erl      |  1 +
 lib/compiler/test/bs_match_SUITE.erl | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'lib')

diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index be15495672..812e85553f 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -370,6 +370,7 @@ bsm_rename_ctx(#l{ke={test,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={bif,_,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={gc_bif,_,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={set,_,_}}=L, _, _, _) -> L;
+bsm_rename_ctx(#l{ke={call,_,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={block,_}}=L, Old, _, false) ->
     %% This block is not inside a protected. The match context variable cannot
     %% possibly be live inside the block.
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,
-- 
cgit v1.2.3