Merge branch 'bjorn/compiler/cover'

* bjorn/compiler/cover:
  compiler.cover: Remove deleted module sys_pre_expand
  Cover the first clause of v3_core:bin_expand_string/4
  compile_SUITE: Test the r16, r17, r18, r19 options
  erl_bifs: Remove pure BIFs serving no useful purpose
  erl_bifs: Remove erlang:hash/2 from list of pure functions

1 files changed, 44 insertions, 2 deletions

diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 1d9c7c44fa..f9bcb044ac 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -35,7 +35,8 @@
 	 cover/1, env/1, core/1,
 	 core_roundtrip/1, asm/1, optimized_guards/1,
 	 sys_pre_attributes/1, dialyzer/1,
-	 warnings/1, pre_load_check/1, env_compiler_options/1
+	 warnings/1, pre_load_check/1, env_compiler_options/1,
+         bc_options/1
 	]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -52,7 +53,7 @@ all() ->
      strict_record, utf8_atoms, utf8_functions, extra_chunks,
      cover, env, core, core_roundtrip, asm, optimized_guards,
      sys_pre_attributes, dialyzer, warnings, pre_load_check,
-     env_compiler_options, custom_debug_info].
+     env_compiler_options, custom_debug_info, bc_options].
 
 groups() -> 
     [].
@@ -1364,6 +1365,47 @@ env_compiler_options(_Config) ->
     end,
     lists:foreach(F, Cases).
 
+%% Test options for compatibility with previous major versions of OTP.
+
+bc_options(Config) ->
+    DataDir = proplists:get_value(data_dir, Config),
+
+    101 = highest_opcode(DataDir, small_float, [no_line_info]),
+
+    103 = highest_opcode(DataDir, big,
+                         [no_record_opt,no_line_info,no_stack_trimming]),
+
+    125 = highest_opcode(DataDir, small_float, [no_line_info,no_float_opt]),
+
+    132 = highest_opcode(DataDir, small,
+                         [no_record_opt,no_float_opt,no_line_info]),
+
+    136 = highest_opcode(DataDir, big, [no_record_opt,no_line_info]),
+
+    153 = highest_opcode(DataDir, big, [no_record_opt]),
+    153 = highest_opcode(DataDir, big, [r16]),
+    153 = highest_opcode(DataDir, big, [r17]),
+    153 = highest_opcode(DataDir, big, [r18]),
+    153 = highest_opcode(DataDir, big, [r19]),
+    153 = highest_opcode(DataDir, small_float, [r16]),
+    153 = highest_opcode(DataDir, small_float, []),
+
+    158 = highest_opcode(DataDir, small_maps, [r17]),
+    158 = highest_opcode(DataDir, small_maps, [r18]),
+    158 = highest_opcode(DataDir, small_maps, [r19]),
+    158 = highest_opcode(DataDir, small_maps, []),
+
+    159 = highest_opcode(DataDir, big, []),
+
+    ok.
+
+highest_opcode(DataDir, Mod, Opt) ->
+    Src = filename:join(DataDir, atom_to_list(Mod)++".erl"),
+    {ok,Mod,Beam} = compile:file(Src, [binary|Opt]),
+    {ok,{Mod,[{"Code",Code}]}} = beam_lib:chunks(Beam, ["Code"]),
+    <<16:32,0:32,HighestOpcode:32,_/binary>> = Code,
+    HighestOpcode.
+
 %%%
 %%% Utilities.
 %%%