File 1401-compiler-Remove-some-vestigial-code-for-OT... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1401-compiler-Remove-some-vestigial-code-for-OTP-21-suppo.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Currently displaying revision f11a8876faa0a8240b9c8df85bc35eb2 , Show latest

From b85299afd9f24ec24c022bdb596b209e124be82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Thu, 7 Oct 2021 17:29:28 +0200
Subject: [PATCH] compiler: Remove some vestigial code for OTP 21 support

---
 lib/compiler/src/beam_ssa_pp.erl           |  4 ++--
 lib/compiler/src/beam_types.erl            | 22 ++++-----------------
 lib/compiler/src/beam_types.hrl            |  6 ++----
 lib/compiler/src/beam_validator.erl        | 23 +++++++++-------------
 lib/compiler/test/beam_validator_SUITE.erl |  6 +++---
 5 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/lib/compiler/src/beam_ssa_pp.erl b/lib/compiler/src/beam_ssa_pp.erl
index e5ebbaed13..601e2be5df 100644
--- a/lib/compiler/src/beam_ssa_pp.erl
+++ b/lib/compiler/src/beam_ssa_pp.erl
@@ -286,8 +286,8 @@ format_type(#t_bs_matchable{tail_unit=U}) ->
     io_lib:format("bs_matchable(~p)", [U]);
 format_type(#t_bitstring{size_unit=S}) ->
     io_lib:format("bitstring(~p)", [S]);
-format_type(#t_bs_context{tail_unit=U,slots=S,valid=V}) ->
-    io_lib:format("bs_context(~p, ~p, ~p)", [U, S, V]);
+format_type(#t_bs_context{tail_unit=U}) ->
+    io_lib:format("bs_context(~p)", [U]);
 format_type(#t_fun{arity=any,type=any}) ->
     "fun()";
 format_type(#t_fun{arity=any,type=T}) ->
diff --git a/lib/compiler/src/beam_types.erl b/lib/compiler/src/beam_types.erl
index 8a5f1775dd..a6ec9fdd77 100644
--- a/lib/compiler/src/beam_types.erl
+++ b/lib/compiler/src/beam_types.erl
@@ -723,20 +723,9 @@ glb(#t_bitstring{size_unit=U1}, #t_bitstring{size_unit=U2}) ->
 glb(#t_bitstring{size_unit=UnitA}=T, #t_bs_matchable{tail_unit=UnitB}) ->
     Unit = UnitA * UnitB div gcd(UnitA, UnitB),
     T#t_bitstring{size_unit=Unit};
-glb(#t_bs_context{tail_unit=UnitA,slots=SlotCountA,valid=ValidSlotsA},
-    #t_bs_context{tail_unit=UnitB,slots=SlotCountB,valid=ValidSlotsB}) ->
-    CommonSlotMask = (1 bsl min(SlotCountA, SlotCountB)) - 1,
-    CommonSlotsA = ValidSlotsA band CommonSlotMask,
-    CommonSlotsB = ValidSlotsB band CommonSlotMask,
+glb(#t_bs_context{tail_unit=UnitA}, #t_bs_context{tail_unit=UnitB}) ->
     Unit = UnitA * UnitB div gcd(UnitA, UnitB),
-    if
-        CommonSlotsA =:= CommonSlotsB ->
-            #t_bs_context{tail_unit=Unit,
-                          slots=max(SlotCountA, SlotCountB),
-                          valid=ValidSlotsA bor ValidSlotsB};
-        CommonSlotsA =/= CommonSlotsB ->
-            none
-    end;
+    #t_bs_context{tail_unit=Unit};
 glb(#t_bs_context{tail_unit=UnitA}=T, #t_bs_matchable{tail_unit=UnitB}) ->
     Unit = UnitA * UnitB div gcd(UnitA, UnitB),
     T#t_bs_context{tail_unit=Unit};
@@ -899,11 +888,8 @@ lub(#t_bitstring{size_unit=U1}, #t_bs_context{tail_unit=U2}) ->
     #t_bs_matchable{tail_unit=gcd(U1, U2)};
 lub(#t_bitstring{size_unit=UnitA}, #t_bs_matchable{tail_unit=UnitB}) ->
     lub_bs_matchable(UnitA, UnitB);
-lub(#t_bs_context{tail_unit=UnitA,slots=SlotsA,valid=ValidA},
-    #t_bs_context{tail_unit=UnitB,slots=SlotsB,valid=ValidB}) ->
-    #t_bs_context{tail_unit=gcd(UnitA, UnitB),
-                  slots=min(SlotsA, SlotsB),
-                  valid=ValidA band ValidB};
+lub(#t_bs_context{tail_unit=UnitA}, #t_bs_context{tail_unit=UnitB}) ->
+    #t_bs_context{tail_unit=gcd(UnitA, UnitB)};
 lub(#t_bs_context{tail_unit=U1}, #t_bitstring{size_unit=U2}) ->
     #t_bs_matchable{tail_unit=gcd(U1, U2)};
 lub(#t_bs_context{tail_unit=UnitA}, #t_bs_matchable{tail_unit=UnitB}) ->
diff --git a/lib/compiler/src/beam_types.hrl b/lib/compiler/src/beam_types.hrl
index c20e1ce7a0..fb13936c48 100644
--- a/lib/compiler/src/beam_types.hrl
+++ b/lib/compiler/src/beam_types.hrl
@@ -78,10 +78,8 @@
 
 -record(t_atom, {elements=any :: 'any' | ordsets:ordset(atom())}).
 -record(t_bitstring, {size_unit=1 :: pos_integer()}).
--record(t_bs_context, {tail_unit=1 :: pos_integer(),
-                       slots=0 :: non_neg_integer(),
-                       valid=0 :: non_neg_integer()}).
--record(t_bs_matchable, {tail_unit=1}).
+-record(t_bs_context, {tail_unit=1 :: pos_integer()}).
+-record(t_bs_matchable, {tail_unit=1 :: pos_integer()}).
 -record(t_float, {elements=any :: 'any' | {float(),float()}}).
 -record(t_fun, {arity=any :: arity() | 'any',
                 type=any :: type() }).
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 4c9122d2c6..66aec54af9 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -844,9 +844,9 @@ vi({bs_get_tail,Ctx,Dst,Live}, Vst0) ->
     extract_term(#t_bitstring{size_unit=Unit}, bs_get_tail, [Ctx], Dst,
                  Vst, Vst0);
 vi({bs_start_match4,Fail,Live,Src,Dst}, Vst) ->
-    validate_bs_start_match(Fail, Live, 0, Src, Dst, Vst);
+    validate_bs_start_match(Fail, Live, Src, Dst, Vst);
 vi({test,bs_start_match3,{f,_}=Fail,Live,[Src],Dst}, Vst) ->
-    validate_bs_start_match(Fail, Live, 0, Src, Dst, Vst);
+    validate_bs_start_match(Fail, Live, Src, Dst, Vst);
 vi({test,bs_match_string,{f,Fail},[Ctx,Stride,{string,String}]}, Vst) ->
     true = is_bitstring(String),                %Assertion.
     validate_bs_skip(Fail, Ctx, Stride, Vst);
@@ -1382,14 +1382,14 @@ validate_bif_1(Kind, Op, Fail, Ss, Dst, OrigVst, Vst) ->
 %% Common code for validating bs_start_match* instructions.
 %%
 
-validate_bs_start_match({atom,resume}, Live, 0, Src, Dst, Vst0) ->
+validate_bs_start_match({atom,resume}, Live, Src, Dst, Vst0) ->
     assert_type(#t_bs_context{}, Src, Vst0),
     verify_live(Live, Vst0),
     verify_y_init(Vst0),
 
     Vst = assign(Src, Dst, Vst0),
     prune_x_regs(Live, Vst);
-validate_bs_start_match({atom,no_fail}, Live, Slots, Src, Dst, Vst0) ->
+validate_bs_start_match({atom,no_fail}, Live, Src, Dst, Vst0) ->
     verify_live(Live, Vst0),
     verify_y_init(Vst0),
 
@@ -1399,11 +1399,10 @@ validate_bs_start_match({atom,no_fail}, Live, Slots, Src, Dst, Vst0) ->
     SrcType = get_movable_term_type(Src, Vst1),
     TailUnit = beam_types:get_bs_matchable_unit(SrcType),
 
-    CtxType = #t_bs_context{slots=Slots,tail_unit=TailUnit},
-
     Vst = prune_x_regs(Live, Vst1),
-    extract_term(CtxType, bs_start_match, [Src], Dst, Vst, Vst0);
-validate_bs_start_match({f,Fail}, Live, Slots, Src, Dst, Vst) ->
+    extract_term(#t_bs_context{tail_unit=TailUnit}, bs_start_match,
+                 [Src], Dst, Vst, Vst0);
+validate_bs_start_match({f,Fail}, Live, Src, Dst, Vst) ->
     assert_no_exception(Fail),
 
     branch(Fail, Vst,
@@ -1411,7 +1410,7 @@ validate_bs_start_match({f,Fail}, Live, Slots, Src, Dst, Vst) ->
                    update_type(fun subtract/2, #t_bs_matchable{}, Src, FailVst)
            end,
            fun(SuccVst) ->
-                   validate_bs_start_match({atom,no_fail}, Live, Slots,
+                   validate_bs_start_match({atom,no_fail}, Live,
                                            Src, Dst, SuccVst)
            end).
 
@@ -1486,11 +1485,7 @@ advance_bs_context(_Ctx, Stride, _Vst) when Stride < 0 ->
     %% We _KNOW_ we'll fail at runtime.
     throw({invalid_argument, {negative_stride, Stride}});
 advance_bs_context(Ctx, Stride, Vst0) ->
-    %% slots/valid must remain untouched to support +r21.
-    CtxType0 = get_raw_type(Ctx, Vst0),
-    CtxType = CtxType0#t_bs_context{ tail_unit=Stride },
-
-    Vst = update_type(fun join/2, CtxType, Ctx, Vst0),
+    Vst = update_type(fun join/2, #t_bs_context{tail_unit=Stride}, Ctx, Vst0),
 
     %% The latest saved position (if any) is no longer current, make sure
     %% it isn't updated on the next match operation.
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index 565a86be98..89cacd78f0 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -803,7 +803,7 @@ bs_saved_position_units(Config) when is_list(Config) ->
                {'%',
                    {var_info,
                        {x,0},
-                       [{type,{t_bs_context,8,0,0}},accepts_match_context]}},
+                       [{type,{t_bs_context,8}},accepts_match_context]}},
                {move,nil,{x,0}},
                return]},
           {function,no_errors,1,4,
@@ -864,8 +864,8 @@ bs_saved_position_units(Config) when is_list(Config) ->
       {{call_only,1,{f,2}},
        14,
        {bad_arg_type,{x,0},
-                     {t_bs_context,12,0,0},
-                     {t_bs_context,8,0,0}}}}] = Errors,
+                     {t_bs_context,12},
+                     {t_bs_context,8}}}}] = Errors,
 
     ok.
 
-- 
2.31.1

Places

File 1401-compiler-Remove-some-vestigial-code-for-OTP-21-suppo.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Places