Merge branch 'bjorn/compiler/beam_validator'

* bjorn/compiler/beam_validator:
  beam_validator: Exit immediately on crashes
  beam_validator: Remove the file/1 and files/1 functions
  beam_validator: Remove support for all other unsupported instructions
  beam_validator: Remove support for unsupported bit syntax instructions

17 files changed, 130 insertions, 237 deletions

diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index 8bbbcb21f2..c441f9f284 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -21,14 +21,14 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
-	 beam_files/1,compiler_bug/1,stupid_but_valid/1,
+	 compiler_bug/1,stupid_but_valid/1,
 	 xrange/1,yrange/1,stack/1,call_last/1,merge_undefined/1,
 	 uninit/1,unsafe_catch/1,
-	 dead_code/1,mult_labels/1,
+	 dead_code/1,
 	 overwrite_catchtag/1,overwrite_trytag/1,accessing_tags/1,bad_catch_try/1,
 	 cons_guard/1,
 	 freg_range/1,freg_uninit/1,freg_state/1,
-	 bin_match/1,bad_bin_match/1,bin_aligned/1,bad_dsetel/1,
+	 bad_bin_match/1,bin_aligned/1,bad_dsetel/1,
 	 state_after_fault_in_catch/1,no_exception_in_catch/1,
 	 undef_label/1,illegal_instruction/1,failing_gc_guard_bif/1,
 	 map_field_lists/1]).
@@ -48,16 +48,16 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [beam_files,{group,p}].
+    [{group,p}].
 
 groups() -> 
     [{p,test_lib:parallel(),
       [compiler_bug,stupid_but_valid,xrange,
        yrange,stack,call_last,merge_undefined,uninit,
-       unsafe_catch,dead_code,mult_labels,
+       unsafe_catch,dead_code,
        overwrite_catchtag,overwrite_trytag,accessing_tags,
        bad_catch_try,cons_guard,freg_range,freg_uninit,
-       freg_state,bin_match,bad_bin_match,bin_aligned,bad_dsetel,
+       freg_state,bad_bin_match,bin_aligned,bad_dsetel,
        state_after_fault_in_catch,no_exception_in_catch,
        undef_label,illegal_instruction,failing_gc_guard_bif,
        map_field_lists]}].
@@ -74,27 +74,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
-
-beam_files(Config) when is_list(Config) ->
-    ?line DataDir = proplists:get_value(data_dir, Config),
-    ?line Wc = filename:join([DataDir,"..","..","*","*.beam"]),
-    %% Must have at least two files here, or there will be
-    %% a grammatical error in the output of the io:format/2 call below. ;-)
-    ?line [_,_|_] = Fs = filelib:wildcard(Wc),
-    ?line io:format("~p files\n", [length(Fs)]),
-    test_lib:p_run(fun do_beam_file/1, Fs).
-
-
-do_beam_file(F) ->
-    case beam_validator:file(F) of
-	ok ->
-	    ok;
-	{error,Es} ->
-	    io:format("File:  ~s", [F]),
-	    io:format("Error: ~p\n", [Es]),
-	    error
-    end.
-
 compiler_bug(Config) when is_list(Config) ->
     %% Check that the compiler returns an error if we try to
     %% assemble one of the bad '.S' files.
@@ -154,14 +133,14 @@ yrange(Config) when is_list(Config) ->
 
 stack(Config) when is_list(Config) ->
     Errors = do_val(stack, Config),
-    ?line [{{t,a,2},{return,11,{stack_frame,2}}},
-	   {{t,b,2},{{deallocate,2},4,{allocated,none}}},
-	   {{t,c,2},{{deallocate,2},12,{allocated,none}}},
-	   {{t,d,2},
-	    {{allocate,2,2},5,{existing_stack_frame,{size,2}}}},
-	   {{t,e,2},{{deallocate,5},6,{allocated,2}}},
-	   {{t,bad_1,0},{{allocate_zero,2,10},4,{{x,9},not_live}}},
-	   {{t,bad_2,0},{{move,{y,0},{x,0}},5,{unassigned,{y,0}}}}] = Errors,
+    [{{t,a,2},{return,11,{stack_frame,2}}},
+     {{t,b,2},{{deallocate,2},4,{allocated,none}}},
+     {{t,bad_1,0},{{allocate_zero,2,10},4,{{x,9},not_live}}},
+     {{t,bad_2,0},{{move,{y,0},{x,0}},5,{unassigned,{y,0}}}},
+     {{t,c,2},{{deallocate,2},12,{allocated,none}}},
+     {{t,d,2},
+      {{allocate,2,2},5,{existing_stack_frame,{size,2}}}},
+     {{t,e,2},{{deallocate,5},6,{allocated,2}}}] = Errors,
     ok.
 
 call_last(Config) when is_list(Config) ->
@@ -175,10 +154,10 @@ call_last(Config) when is_list(Config) ->
 
 merge_undefined(Config) when is_list(Config) ->
     Errors = do_val(merge_undefined, Config),
-    ?line [{{t,handle_call,2},
-	    {{call_ext,2,{extfunc,debug,filter,2}},
-	     22,
-	     {uninitialized_reg,{y,0}}}}] = Errors,
+    [{{t,handle_call,2},
+      {{call_ext,2,{extfunc,debug,filter,2}},
+       23,
+       {uninitialized_reg,{y,0}}}}] = Errors,
     ok.
 
 uninit(Config) when is_list(Config) ->
@@ -187,7 +166,7 @@ uninit(Config) when is_list(Config) ->
 	[{{t,sum_1,2},
 	  {{move,{y,0},{x,0}},5,{uninitialized_reg,{y,0}}}},
 	 {{t,sum_2,2},
-	  {{call,1,{f,10}},6,{uninitialized_reg,{y,0}}}},
+	  {{call,1,{f,8}},6,{uninitialized_reg,{y,0}}}},
 	 {{t,sum_3,2},
 	  {{bif,'+',{f,0},[{x,0},{y,0}],{x,0}},
 	   7,
@@ -208,10 +187,6 @@ dead_code(Config) when is_list(Config) ->
     [] = do_val(dead_code, Config),
     ok.
 
-mult_labels(Config) when is_list(Config) ->
-    [] = do_val(erl_prim_loader, Config, ".beam"),
-    ok.
-
 overwrite_catchtag(Config) when is_list(Config) ->
     Errors = do_val(overwrite_catchtag, Config),
     ?line
@@ -228,11 +203,10 @@ overwrite_trytag(Config) when is_list(Config) ->
 
 accessing_tags(Config) when is_list(Config) ->
     Errors = do_val(accessing_tags, Config),
-    ?line
-	[{{accessing_tags,foo,1},
-	  {{move,{y,0},{x,0}},6,{catchtag,_}}},
-	 {{accessing_tags,bar,1},
-	  {{move,{y,0},{x,0}},6,{trytag,_}}}] = Errors,
+    [{{accessing_tags,bar,1},
+      {{move,{y,0},{x,0}},6,{trytag,_}}},
+     {{accessing_tags,foo,1},
+      {{move,{y,0},{x,0}},6,{catchtag,_}}}] = Errors,
     ok.
 
 bad_catch_try(Config) when is_list(Config) ->
@@ -319,13 +293,6 @@ freg_state(Config) when is_list(Config) ->
 	  {fclearerror,5,{bad_floating_point_state,cleared}}}] = Errors,
     ok.
 
-bin_match(Config) when is_list(Config) ->
-    Errors = do_val(bin_match, Config),
-    ?line
-	[{{t,t,1},{{bs_save,0},4,no_bs_match_state}},
-	 {{t,x,1},{{bs_restore,1},16,{no_save_point,1}}}] = Errors,
-    ok.
-
 bad_bin_match(Config) when is_list(Config) ->
 	[{{t,t,1},{return,5,{match_context,{x,0}}}}] =
 		do_val(bad_bin_match, Config),
@@ -349,20 +316,20 @@ bad_dsetel(Config) when is_list(Config) ->
     ?line
 	[{{t,t,1},
 	  {{set_tuple_element,{x,1},{x,0},1},
-	   15,
+	   17,
 	   illegal_context_for_set_tuple_element}}] = Errors,
     ok.
 
 state_after_fault_in_catch(Config) when is_list(Config) ->
     Errors = do_val(state_after_fault_in_catch, Config),
-    [{{t,foo,1},
-      {{move,{x,1},{x,0}},10,{uninitialized_reg,{x,1}}}},
-     {{state_after_fault_in_catch,if_end,1},
+    [{{state_after_fault_in_catch,badmatch,1},
       {{move,{x,1},{x,0}},9,{uninitialized_reg,{x,1}}}},
      {{state_after_fault_in_catch,case_end,1},
       {{move,{x,1},{x,0}},9,{uninitialized_reg,{x,1}}}},
-     {{state_after_fault_in_catch,badmatch,1},
-      {{move,{x,1},{x,0}},9,{uninitialized_reg,{x,1}}}}] = Errors,
+     {{state_after_fault_in_catch,if_end,1},
+      {{move,{x,1},{x,0}},9,{uninitialized_reg,{x,1}}}},
+     {{t,foo,1},
+      {{move,{x,1},{x,0}},10,{uninitialized_reg,{x,1}}}}] = Errors,
     ok.
 
 no_exception_in_catch(Config) when is_list(Config) ->
@@ -372,13 +339,46 @@ no_exception_in_catch(Config) when is_list(Config) ->
     ok.
 
 undef_label(Config) when is_list(Config) ->
-    Errors = do_val(undef_label, Config),
+    M = {undef_label,
+	 [{t,1}],
+	 [],
+	 [{function,t,1,2,
+	   [{label,1},
+	    {func_info,{atom,undef_label},{atom,t},1},
+	    {label,2},
+	    {test,is_eq_exact,{f,42},[{x,0},{atom,x}]},
+	    {move,{atom,ok},{x,0}},
+	    return]},
+	  {function,x,1,17,
+	   [{label,3},
+	    {func_info,{atom,undef_label},{atom,x},1},
+	    {label,4},
+	    return]}],
+	 5},
+    Errors = beam_val(M),
     [{{undef_label,t,1},{undef_labels,[42]}},
      {{undef_label,x,1},{return,4,no_entry_label}}] = Errors,
     ok.
 
 illegal_instruction(Config) when is_list(Config) ->
-    Errors = do_val(illegal_instruction, Config),
+    M = {illegal_instruction,
+	 [{t,1},{x,1},{y,0}],
+	 [],
+	 [{function,t,1,2,
+	   [{label,1},
+	    {func_info,{atom,illegal_instruction},{atom,t},1},
+	    {label,2},
+	    {my_illegal_instruction,{x,0}},
+	    return]},
+	  {function,x,1,4,
+	   [{label,3},
+	    bad_func_info,
+	    {label,4},
+	    {my_illegal_instruction,{x,0}},
+	    return]},
+	  {function,y,0,17,[]}],
+	 5},
+    Errors = beam_val(M),
     [{{illegal_instruction,t,1},
       {{my_illegal_instruction,{x,0}},4,unknown_instruction}},
      {{'_',x,1},{bad_func_info,1,illegal_instruction}},
@@ -431,16 +431,25 @@ map_field_lists(Config) ->
 
 %%%-------------------------------------------------------------------------
 
-do_val(Name, Config) ->
-    do_val(Name, Config, ".S").
-
-do_val(Name, Config, Type) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, atom_to_list(Name)++Type),
-    ?line case beam_validator:file(File) of
-	      {error,Errors} ->
-		  ?line io:format("~p:~n~s", 
-				  [File,beam_validator:format_error(Errors)]),
-		  Errors;
-	      ok -> []
-	  end.
+do_val(Mod, Config) ->
+    Data = ?config(data_dir, Config),
+    Base = atom_to_list(Mod),
+    File = filename:join(Data, Base),
+    case compile:file(File, [from_asm,no_postopt,return_errors]) of
+	{error,L,[]} ->
+	    [{Base,Errors0}] = L,
+	    Errors = [E || {beam_validator,E} <- Errors0],
+	    _ = [io:put_chars(beam_validator:format_error(E)) ||
+		    E <- Errors],
+	    Errors;
+	{ok,Mod} ->
+	    []
+    end.
+
+beam_val(M) ->
+    Name = atom_to_list(element(1, M)),
+    {error,[{Name,Errors0}]} = beam_validator:module(M, []),
+    Errors = [E || {beam_validator,E} <- Errors0],
+    _ = [io:put_chars(beam_validator:format_error(E)) ||
+	    E <- Errors],
+    Errors.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bad_dsetel.S b/lib/compiler/test/beam_validator_SUITE_data/bad_dsetel.S
index 279b2fa97f..9630d73a93 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/bad_dsetel.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/bad_dsetel.S
@@ -1,4 +1,4 @@
-{module, t}.  %% version = 0
+{module, bad_dsetel}.  %% version = 0
 
 {exports, [{module_info,0},{module_info,1},{t,1}]}.
 
@@ -21,7 +21,9 @@
     {move,{integer,3},{x,0}}.
     {call_ext,3,{extfunc,erlang,setelement,3}}.
     {test_heap,6,1}.
-    {put_string,3,{string,"abc"},{x,1}}.
+    {put_list,{integer,99},nil,{x,1}}.
+    {put_list,{integer,98},{x,1},{x,1}}.
+    {put_list,{integer,97},{x,1},{x,1}}.
     {set_tuple_element,{x,1},{x,0},1}.
     {'%live',1}.
     {deallocate,0}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bin_aligned.S b/lib/compiler/test/beam_validator_SUITE_data/bin_aligned.S
index 2f353fbd25..a59f7ccc03 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/bin_aligned.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/bin_aligned.S
@@ -1,4 +1,4 @@
-{module, t}.  %% version = 0
+{module, bin_aligned}.  %% version = 0
 
 {exports, [{decode,1},{module_info,0},{module_info,1}]}.
 
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bin_match.S b/lib/compiler/test/beam_validator_SUITE_data/bin_match.S
deleted file mode 100644
index 96df0f7933..0000000000
--- a/lib/compiler/test/beam_validator_SUITE_data/bin_match.S
+++ /dev/null
@@ -1,64 +0,0 @@
-{module, bin_match}.  %% version = 0
-
-{exports, [{t,1}]}.
-
-{attributes, []}.
-
-{labels, 8}.
-
-
-{function, t, 1, 2}.
-  {label,1}.
-    {func_info,{atom,t},{atom,t},1}.
-  {label,2}.
-%%    {test,bs_start_match,{f,1},[{x,0}]}.
-    {bs_save,0}.
-    {test,bs_get_integer,
-          {f,3},
-          [{integer,8},1,{field_flags,[aligned,unsigned,big]},{x,1}]}.
-    {test,bs_get_integer,
-          {f,3},
-          [{integer,8},1,{field_flags,[aligned,unsigned,big]},{x,2}]}.
-    {test,bs_test_tail,{f,3},[0]}.
-    {test_heap,3,3}.
-    {put_tuple,2,{x,0}}.
-    {put,{x,1}}.
-    {put,{x,2}}.
-    {'%live',1}.
-    return.
-  {label,3}.
-    {bs_restore,0}.
-    {test,bs_get_integer,
-          {f,1},
-          [{integer,32},1,{field_flags,[aligned,unsigned,big]},{x,1}]}.
-    {test,bs_test_tail,{f,1},[0]}.
-    {move,{x,1},{x,0}}.
-    return.
-
-{function, x, 1, 5}.
-  {label,4}.
-    {func_info,{atom,t},{atom,x},1}.
-  {label,5}.
-    {test,bs_start_match,{f,4},[{x,0}]}.
-    {bs_save,0}.
-    {test,bs_get_integer,
-          {f,6},
-          [{integer,8},1,{field_flags,[aligned,unsigned,big]},{x,1}]}.
-    {test,bs_get_integer,
-          {f,6},
-          [{integer,8},1,{field_flags,[aligned,unsigned,big]},{x,2}]}.
-    {test,bs_test_tail,{f,6},[0]}.
-    {test_heap,3,3}.
-    {put_tuple,2,{x,0}}.
-    {put,{x,1}}.
-    {put,{x,2}}.
-    {'%live',1}.
-    return.
-  {label,6}.
-    {bs_restore,1}.
-    {test,bs_get_integer,
-          {f,4},
-          [{integer,32},1,{field_flags,[aligned,unsigned,big]},{x,1}]}.
-    {test,bs_test_tail,{f,4},[0]}.
-    {move,{x,1},{x,0}}.
-    return.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/dead_code.S b/lib/compiler/test/beam_validator_SUITE_data/dead_code.S
index f964f98fba..c114664ba0 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/dead_code.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/dead_code.S
@@ -1,10 +1,10 @@
 {module, dead_code}.  %% version = 0
 
-{exports, [{execute,0},{module_info,0},{module_info,1}]}.
+{exports, [{execute,0}]}.
 
 {attributes, []}.
 
-{labels, 10}.
+{labels, 6}.
 
 
 {function, execute, 0, 2}.
@@ -12,7 +12,6 @@
     {func_info,{atom,dead_code},{atom,execute},0}.
   {label,2}.
     {allocate,0,0}.
-    {'%live',0}.
     {call_ext,0,{extfunc,foo,fie,0}}.
     {test,is_ne,{f,4},[{x,0},{integer,0}]}.
     {test,is_ne,{f,4},[{x,0},{integer,1}]}.
@@ -22,27 +21,7 @@
     {case_end,{x,0}}.
   {label,4}.
     {move,{atom,ok},{x,0}}.
-    {'%live',1}.
     {deallocate,0}.
     return.
-    {'%','Moved code'}.
   {label,5}.
     {case_end,{x,0}}.
-
-
-{function, module_info, 0, 7}.
-  {label,6}.
-    {func_info,{atom,dead_code},{atom,module_info},0}.
-  {label,7}.
-    {move,nil,{x,0}}.
-    {'%live',1}.
-    return.
-
-
-{function, module_info, 1, 9}.
-  {label,8}.
-    {func_info,{atom,dead_code},{atom,module_info},1}.
-  {label,9}.
-    {move,nil,{x,0}}.
-    {'%live',1}.
-    return.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/erl_prim_loader.beam b/lib/compiler/test/beam_validator_SUITE_data/erl_prim_loader.beam
deleted file mode 100644
index dd58a88e42..0000000000
--- a/lib/compiler/test/beam_validator_SUITE_data/erl_prim_loader.beam
+++ /dev/null
diff --git a/lib/compiler/test/beam_validator_SUITE_data/freg_range.S b/lib/compiler/test/beam_validator_SUITE_data/freg_range.S
index ee583a923e..b3ebff3ade 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/freg_range.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/freg_range.S
@@ -1,10 +1,10 @@
 {module, freg_range}.  %% version = 0
 
-{exports, [{module_info,0},{module_info,1},{prod,2},{sum,2},{sum_prod,3}]}.
+{exports, [{sum_1,2},{sum_2,2},{sum_3,2},{sum_4,2}]}.
 
 {attributes, []}.
 
-{labels, 8}.
+{labels, 9}.
 
 
 {function, sum_1, 2, 2}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/freg_state.S b/lib/compiler/test/beam_validator_SUITE_data/freg_state.S
index ff4d7548ae..7466763482 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/freg_state.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/freg_state.S
@@ -1,6 +1,6 @@
 {module, freg_state}.  %% version = 0
 
-{exports, []}.
+{exports, [{sum_1,2},{sum_2,2},{sum_3,2},{sum_4,2},{sum_5,2}]}.
 
 {attributes, []}.
 
diff --git a/lib/compiler/test/beam_validator_SUITE_data/freg_uninit.S b/lib/compiler/test/beam_validator_SUITE_data/freg_uninit.S
index f8d805d9ec..71e833446a 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/freg_uninit.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/freg_uninit.S
@@ -1,10 +1,10 @@
 {module, freg_uninit}.  %% version = 0
 
-{exports, []}.
+{exports, [{sum_1,2},{sum_2,2}]}.
 
 {attributes, []}.
 
-{labels, 8}.
+{labels, 7}.
 
 
 {function, sum_1, 2, 2}.
@@ -14,7 +14,6 @@
     {fconv,{x,0},{fr,0}}.
     fclearerror.
     {bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,0}}.
-    {'%live',1}.
     return.
 
 
@@ -26,7 +25,12 @@
     {fconv,{x,1},{fr,1}}.
     fclearerror.
     {fcheckerror,{f,0}}.
-    {call,2,{f,8}}.
+    {call,2,{f,6}}.
     {bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,0}}.
-    {'%live',1}.
+    return.
+
+{function, foo, 2, 6}.
+  {label,5}.
+    {func_info,{atom,t},{atom,foo},2}.
+  {label,6}.
     return.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/illegal_instruction.S b/lib/compiler/test/beam_validator_SUITE_data/illegal_instruction.S
deleted file mode 100644
index d6e92abc71..0000000000
--- a/lib/compiler/test/beam_validator_SUITE_data/illegal_instruction.S
+++ /dev/null
@@ -1,26 +0,0 @@
-{module, illegal_instruction}.  %% version = 0
-
-{exports, []}.
-
-{attributes, []}.
-
-{labels, 7}.
-
-
-{function, t, 1, 2}.
-  {label,1}.
-    {func_info,{atom,illegal_instruction},{atom,t},1}.
-  {label,2}.
-    {my_illegal_instruction,{x,0}}.
-    return.
-
-
-{function, x, 1, 4}.
-  {label,3}.
-    bad_func_info.
-  {label,4}.
-    {my_illegal_instruction,{x,0}}.
-    return.
-
-{function, y, 0, 17}.
-	
\ No newline at end of file
diff --git a/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S b/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S
index 3d76127824..481d55045d 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S
@@ -22,7 +22,8 @@
   {label,4}.
     {allocate_heap,1,6,2}.
     {move,{x,1},{y,0}}.
-    {put_string,2,{string,"~p"},{x,0}}.
+    {put_list,{integer,112},nil,{x,0}}.
+    {put_list,{integer,126},{x,0},{x,0}}.
     {put_list,{y,0},nil,{x,1}}.
     {'%live',2}.
     {call_ext,2,{extfunc,io,format,2}}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/no_exception_in_catch.S b/lib/compiler/test/beam_validator_SUITE_data/no_exception_in_catch.S
index e08a718a39..1a5b417a5f 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/no_exception_in_catch.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/no_exception_in_catch.S
@@ -26,7 +26,7 @@
     {call_ext,1,{extfunc,erlang,erase,1}}.
     {move,{atom,nested},{x,0}}.
     {call_ext,1,{extfunc,erlang,erase,1}}.
-    {bif,self,nofail,[],{x,0}}.
+    {bif,self,{f,0},[],{x,0}}.
     {'try',{y,8},{f,13}}.
     {'try',{y,7},{f,11}}.
     {'try',{y,6},{f,9}}.
@@ -34,7 +34,7 @@
 %% Because the following instructions can't possible throw an exception,
 %% label 7 used to get no state. Now the try_end itself will save the state.
     {move,{x,0},{y,4}}.
-    {bif,self,nofail,[],{x,0}}.
+    {bif,self,{f,0},[],{x,0}}.
     {'%live',1}.
     {try_end,{y,5}}.
     {test,is_eq_exact,{f,15},[{x,0},{y,4}]}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/stack.S b/lib/compiler/test/beam_validator_SUITE_data/stack.S
index 244c22a2f9..e4356a9d00 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/stack.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/stack.S
@@ -1,10 +1,10 @@
 {module, stack}.  %% version = 0
 
-{exports, [{a,2},{b,2},{c,2},{d,2},{e,2}]}.
+{exports, [{a,2},{b,2},{c,2},{d,2},{e,2},{bad_1,0},{bad_2,0},{foo,0}]}.
 
 {attributes, []}.
 
-{labels, 21}.
+{labels, 17}.
 
 
 {function, a, 2, 2}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/undef_label.S b/lib/compiler/test/beam_validator_SUITE_data/undef_label.S
deleted file mode 100644
index dd29066bf4..0000000000
--- a/lib/compiler/test/beam_validator_SUITE_data/undef_label.S
+++ /dev/null
@@ -1,22 +0,0 @@
-{module, undef_label}.  %% version = 0
-
-{exports, []}.
-
-{attributes, []}.
-
-{labels, 7}.
-
-
-{function, t, 1, 2}.
-  {label,1}.
-    {func_info,{atom,undef_label},{atom,t},1}.
-  {label,2}.
-    {test,is_eq_exact,{f,42},[{x,0},{atom,x}]}.
-    {move,{atom,ok},{x,0}}.
-    return.
-
-{function, x, 1, 17}.
-  {label,3}.
-    {func_info,{atom,undef_label},{atom,x},1}.
-  {label,4}.
-    return.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/uninit.S b/lib/compiler/test/beam_validator_SUITE_data/uninit.S
index 1a45c31411..9a66f4f7d6 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/uninit.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/uninit.S
@@ -1,9 +1,11 @@
 {module, uninit}.  %% version = 0
 
-{exports, []}.
+{exports, [{sum_1,2},{sum_2,2},{sum_3,2}]}.
 
 {attributes, []}.
 
+{labels, 9}.
+
 {function, sum_1, 2, 2}.
   {label,1}.
     {func_info,{atom,t},{atom,sum_1},2}.
@@ -11,7 +13,7 @@
     {allocate,1,2}.
     {move,{y,0},{x,0}}.
     {'%live',1}.
-    {call,1,{f,10}}.
+    {call,1,{f,8}}.
     {bif,'+',{f,0},[{x,0},{y,0}],{x,0}}.
     {'%live',1}.
     {deallocate,1}.
@@ -23,7 +25,7 @@
   {label,4}.
     {allocate,1,2}.
     {'%live',1}.
-    {call,1,{f,10}}.
+    {call,1,{f,8}}.
     {bif,'+',{f,0},[{x,0},{y,0}],{x,0}}.
     {'%live',1}.
     {deallocate,1}.
@@ -35,14 +37,14 @@
   {label,6}.
     {allocate_zero,1,2}.
     {'%live',1}.
-    {call,1,{f,10}}.
+    {call,1,{f,8}}.
     {bif,'+',{f,0},[{x,0},{y,0}],{x,0}}.
     {'%live',1}.
     {deallocate,1}.
     return.
 
-{function, id, 1, 10}.
-  {label,9}.
+{function, id, 1, 8}.
+  {label,7}.
     {func_info,{atom,t},{atom,id},1}.
-  {label,10}.
+  {label,8}.
     return.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/xrange.S b/lib/compiler/test/beam_validator_SUITE_data/xrange.S
index 3abbdffbc2..c6f20288f7 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/xrange.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/xrange.S
@@ -1,10 +1,10 @@
 {module, xrange}.  %% version = 0
 
-{exports, [{module_info,0},{module_info,1},{prod,2},{sum,2},{sum_prod,3}]}.
+{exports, [{sum_1,2},{sum_2,2},{sum_3,2},{sum_4,2}]}.
 
 {attributes, []}.
 
-{labels, 8}.
+{labels, 9}.
 
 
 {function, sum_1, 2, 2}.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index d721a86f5a..68a31f14d5 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -280,6 +280,14 @@ silly_coverage(Config) when is_list(Config) ->
 		     {label,2}|non_proper_list]}],99},
     expect_error(fun() -> beam_z:module(BeamZInput, []) end),
 
+    %% beam_validator.
+    BeamValInput = {?MODULE,[{foo,0}],[],
+		    [{function,foo,0,2,
+		      [{label,1},
+		       {func_info,{atom,?MODULE},{atom,foo},0},
+		       {label,2}|non_proper_list]}],99},
+    expect_error(fun() -> beam_validator:module(BeamValInput, []) end),
+
     ok.
 
 expect_error(Fun) ->