File 0409-Fix-bug-in-binary-matching.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0409-Fix-bug-in-binary-matching.patch of Package erlang (Revision 833dbe057157a0c006b0e4d551373ea5)

Currently displaying revision 833dbe057157a0c006b0e4d551373ea5 , Show latest

From 2e40d8d1c51ad1c3d3750490ecac6b290233f085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 7 Aug 2018 12:52:33 +0200
Subject: [PATCH] Fix bug in binary matching

The compiler generates incorrect code for the following example:

decode_binary(_, <<Length, Data/binary>>) ->
      case {Length, Data} of
        {0, _} ->
          %% When converting the match context back to a binary,
          %% Data will be set to the entire original binary,
          %% that is, to <<0>> instead of <<>>.
          {{0, 0, 0}, Data};
        {4, <<Y:16/little, M, D, Rest/binary>>} ->
          {{Y, M, D}, Rest}
      end.

The problem is the delayed sub binary creation optimization, which
is not safe to do in this case.

This commit introduces a heuristic that will disable the delayed
sub binary creation optimization for this example.  Unfortunately, the
heuristic may turn off the optimization when it would actually be
safe. In the OTP codebase, the optimization is turned off in two
instances, once in string.erl and once in dets_v9.erl.

https://bugs.erlang.org/browse/ERL-689
---
 lib/compiler/src/beam_bsm.erl        | 13 ++++++++++++-
 lib/compiler/test/bs_match_SUITE.erl | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 1c8e0e9854..abc6e96c85 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -310,7 +310,18 @@ btb_reaches_match_2([{test,bs_start_match2,{f,F},Live,[Bin,_],Ctx}|Is],
     end;
 btb_reaches_match_2([{test,_,{f,F},Ss}=I|Is], Regs, D0) ->
     btb_ensure_not_used(Ss, I, Regs),
-    D = btb_follow_branch(F, Regs, D0),
+    D1 = btb_follow_branch(F, Regs, D0),
+    D = case Is of
+            [{bs_context_to_binary,_}|_] ->
+                %% bs_context_to_binary following a test instruction
+                %% probably needs the current position to be saved as
+                %% the new start position, but we can't be sure.
+                %% Therefore, conservatively disable the optimization
+                %% (instead of forcing a saving of the position).
+                D1#btb{must_save=true,must_not_save=true};
+            _ ->
+                D1
+        end,
     btb_reaches_match_1(Is, Regs, D);
 btb_reaches_match_2([{test,_,{f,F},_,Ss,_}=I|Is], Regs, D0) ->
     btb_ensure_not_used(Ss, I, Regs),
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index e737839575..7814738449 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -38,7 +38,7 @@
 	 no_partition/1,calling_a_binary/1,binary_in_map/1,
 	 match_string_opt/1,select_on_integer/1,
 	 map_and_binary/1,unsafe_branch_caching/1,
-	 bad_literals/1,good_literals/1,constant_propagation/1
+	 bad_literals/1,good_literals/1,constant_propagation/1,erl_689/1
 	]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
@@ -70,7 +70,7 @@ groups() ->
        no_partition,calling_a_binary,binary_in_map,
        match_string_opt,select_on_integer,
        map_and_binary,unsafe_branch_caching,
-       bad_literals,good_literals,constant_propagation]}].
+       bad_literals,good_literals,constant_propagation,erl_689]}].
 
 
 init_per_suite(Config) ->
@@ -1485,6 +1485,34 @@ non_opt_eq([_|_], <<_,_/binary>>) ->
 	    X
     end.
 
+%% ERL-689
+
+erl_689(Config) ->
+    {{0, 0, 0}, <<>>} = do_erl_689_1(<<0>>, ?MODULE),
+    {{2018, 8, 7}, <<>>} = do_erl_689_1(<<4,2018:16/little,8,7>>, ?MODULE),
+    {{0, 0, 0}, <<>>} = do_erl_689_2(?MODULE, <<0>>),
+    {{2018, 8, 7}, <<>>} = do_erl_689_2(?MODULE, <<4,2018:16/little,8,7>>),
+    ok.
+
+do_erl_689_1(<<Length, Data/binary>>, _) ->
+    case {Data, Length} of
+        {_, 0} ->
+            %% bs_context_to_binary would incorrectly set Data to the original
+            %% binary (before matching in the function head).
+            {{0, 0, 0}, Data};
+        {<<Y:16/little, M, D, Rest/binary>>, 4} ->
+            {{Y, M, D}, Rest}
+    end.
+
+do_erl_689_2(_, <<Length, Data/binary>>) ->
+    case {Length, Data} of
+        {0, _} ->
+            %% bs_context_to_binary would incorrectly set Data to the original
+            %% binary (before matching in the function head).
+            {{0, 0, 0}, Data};
+        {4, <<Y:16/little, M, D, Rest/binary>>} ->
+            {{Y, M, D}, Rest}
+    end.
 
 check(F, R) ->
     R = F().
-- 
2.16.4

Places

File 0409-Fix-bug-in-binary-matching.patch of Package erlang (Revision 833dbe057157a0c006b0e4d551373ea5)

Places