From 79fe787c25b2d5328a3866b2c4d0e01649097595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 10 Apr 2018 12:39:04 +0200
Subject: beam_validator: Strengthen validation of remaining GC instructions

1ee21858db7e strengenthed validatation of GC instructions, but
forgot the following instructions:

bs_start_match2/5
bs_get_binary2/7
bs_get_float2/7
bs_get_integer2/7
bs_get_utf8/5
bs_get_utf16/5
bs_get_utf32/5
bs_skip_utf8/4
bs_skip_utf16/4
bs_skip_utf32/4
---
 lib/compiler/src/beam_validator.erl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index ee0011d397..3c0f3a2d25 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -618,6 +618,7 @@ valfun_4({test,bs_start_match2,{f,Fail},Live,[Ctx,NeedSlots],Ctx}, Vst0) ->
     %% is OK as input.
     CtxType = get_move_term_type(Ctx, Vst0),
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst1 = prune_x_regs(Live, Vst0),
     BranchVst = case CtxType of
 		    #ms{} ->
@@ -634,6 +635,7 @@ valfun_4({test,bs_start_match2,{f,Fail},Live,[Ctx,NeedSlots],Ctx}, Vst0) ->
 valfun_4({test,bs_start_match2,{f,Fail},Live,[Src,Slots],Dst}, Vst0) ->
     assert_term(Src, Vst0),
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst1 = prune_x_regs(Live, Vst0),
     Vst = branch_state(Fail, Vst1),
     set_type_reg(bsm_match_state(Slots), Src, Dst, Vst);
@@ -836,6 +838,7 @@ verify_put_map(Fail, Src, Dst, Live, List, Vst0) ->
 validate_bs_get(Fail, Ctx, Live, Type, Dst, Vst0) ->
     bsm_validate_context(Ctx, Vst0),
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst1 = prune_x_regs(Live, Vst0),
     Vst = branch_state(Fail, Vst1),
     set_type_reg(Type, Dst, Vst).
@@ -845,6 +848,7 @@ validate_bs_get(Fail, Ctx, Live, Type, Dst, Vst0) ->
 %%
 validate_bs_skip_utf(Fail, Ctx, Live, Vst0) ->
     bsm_validate_context(Ctx, Vst0),
+    verify_y_init(Vst0),
     verify_live(Live, Vst0),
     Vst = prune_x_regs(Live, Vst0),
     branch_state(Fail, Vst).
-- 
cgit v1.2.3


From 443ac44baf3e51c7dd31162fd60a15d3a0bde183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 11 Apr 2018 10:22:35 +0200
Subject: beam_validator: Remove unnecessary inclusion of beam_disasm.hrl

---
 lib/compiler/src/Makefile           | 1 -
 lib/compiler/src/beam_validator.erl | 2 --
 2 files changed, 3 deletions(-)

(limited to 'lib')

diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index 9e96147787..c81b81e82b 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -186,7 +186,6 @@ release_docs_spec:
 
 $(EBIN)/beam_disasm.beam: $(EGEN)/beam_opcodes.hrl beam_disasm.hrl
 $(EBIN)/beam_listing.beam: core_parse.hrl v3_kernel.hrl
-$(EBIN)/beam_validator.beam: beam_disasm.hrl
 $(EBIN)/cerl.beam: core_parse.hrl
 $(EBIN)/compile.beam: core_parse.hrl ../../stdlib/include/erl_compile.hrl
 $(EBIN)/core_lib.beam: core_parse.hrl
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 3c0f3a2d25..b9d9cdd054 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -27,8 +27,6 @@
 %% Interface for compiler.
 -export([module/2, format_error/1]).
 
--include("beam_disasm.hrl").
-
 -import(lists, [any/2,dropwhile/2,foldl/3,foreach/2,reverse/1]).
 
 %% To be called by the compiler.
-- 
cgit v1.2.3


From 7441d0fd274c02969f5af79048c44d647e3be9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 11 Apr 2018 10:23:31 +0200
Subject: beam_validator: Remove repeated "this"

---
 lib/compiler/src/beam_validator.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index b9d9cdd054..d5aef51dfa 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -567,7 +567,7 @@ valfun_4({loop_rec,{f,Fail},Dst}, Vst0) ->
     Vst = branch_state(Fail, Vst0),
     %% This term may not be part of the root set until
     %% remove_message/0 is executed. If control transfers
-    %% to the loop_rec_end/1 instruction, no part of this
+    %% to the loop_rec_end/1 instruction, no part of
     %% this term must be stored in a Y register.
     set_type_reg({fragile,term}, Dst, Vst);
 valfun_4({wait,_}, Vst) ->
-- 
cgit v1.2.3