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

5 files changed, 69 insertions, 9 deletions

diff --git a/lib/compiler/src/erl_bifs.erl b/lib/compiler/src/erl_bifs.erl
index 35a12d7010..bafa9d75b7 100644
--- a/lib/compiler/src/erl_bifs.erl
+++ b/lib/compiler/src/erl_bifs.erl
@@ -81,7 +81,6 @@ is_pure(erlang, float, 1) -> true;
 is_pure(erlang, float_to_list, 1) -> true;
 is_pure(erlang, float_to_binary, 1) -> true;
 is_pure(erlang, floor, 1) -> true;
-is_pure(erlang, hash, 2) -> false;
 is_pure(erlang, hd, 1) -> true;
 is_pure(erlang, integer_to_binary, 1) -> true;
 is_pure(erlang, integer_to_list, 1) -> true;
@@ -108,14 +107,11 @@ is_pure(erlang, list_to_binary, 1) -> true;
 is_pure(erlang, list_to_float, 1) -> true;
 is_pure(erlang, list_to_integer, 1) -> true;
 is_pure(erlang, list_to_pid, 1) -> true;
-is_pure(erlang, list_to_port, 1) -> true;
-is_pure(erlang, list_to_ref, 1) -> true;
 is_pure(erlang, list_to_tuple, 1) -> true;
 is_pure(erlang, max, 2) -> true;
 is_pure(erlang, min, 2) -> true;
 is_pure(erlang, phash, 2) -> false;
 is_pure(erlang, pid_to_list, 1) -> true;
-is_pure(erlang, port_to_list, 1) -> true;
 is_pure(erlang, round, 1) -> true;
 is_pure(erlang, setelement, 3) -> true;
 is_pure(erlang, size, 1) -> true;
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index ff18f8b41c..fd97eea4cb 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -29,7 +29,8 @@
 	 init_per_testcase/2,end_per_testcase/2,
 	 two/1,test1/1,fail/1,float_bin/1,in_guard/1,in_catch/1,
 	 nasty_literals/1,coerce_to_float/1,side_effect/1,
-	 opt/1,otp_7556/1,float_arith/1,otp_8054/1]).
+	 opt/1,otp_7556/1,float_arith/1,otp_8054/1,
+         cover/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -45,7 +46,7 @@ groups() ->
     [{p,[parallel],
       [two,test1,fail,float_bin,in_guard,in_catch,
        nasty_literals,side_effect,opt,otp_7556,float_arith,
-       otp_8054]}].
+       otp_8054,cover]}].
 
 
 init_per_suite(Config) ->
@@ -552,3 +553,19 @@ otp_8054_1([H|T], Bin) ->
 	end,
     otp_8054_1(T, Bin);
 otp_8054_1([], Bin) -> Bin.
+
+-define(LONG_STRING,
+        "3lz7Q4au2i3DJWNlNhWuzmvA7gYWGXG+LAPtgtlEO2VGSxRqL2WOoHW"
+        "QxORTQfJw17mNEU8i87UKvEPbo9YY8ppiM7vfaG88TTyfEzgUMTgY3I"
+        "vsikMBELPz2AayVz5aaMh9PBFTZ4DkBIFxURBUKHho4Vgt7IzYnWNgn"
+        "3ON5D9VS89TPANK5/PwSUoMQYZ2fk5VLbq7D1ExlnCScvTDnF/WHMQ3"
+        "m2GUcQWb+ajfOf3bnP7EX4f1Q3d/1Soe6lEpf1KN/5S7A/ugjMhy4+H"
+        "Zuo1J1J6CCwEVZ/wDc79OpDPPj/qOGhDK73F8DaMcynZ91El+01vfTn"
+        "uUxNFUHLpuoQ==").
+
+cover(Config) ->
+    %% Cover handling of a huge partially literal string.
+    L = length(Config),
+    Bin = id(<<L:32,?LONG_STRING>>),
+    <<L:32,?LONG_STRING>> = Bin,
+    ok.
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.
 %%%
diff --git a/lib/compiler/test/compile_SUITE_data/small_float.erl b/lib/compiler/test/compile_SUITE_data/small_float.erl
new file mode 100644
index 0000000000..5cbb5aef83
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/small_float.erl
@@ -0,0 +1,5 @@
+-module(small_float).
+-export([f/1]).
+
+f(F) when is_float(F) ->
+    F / 2.
diff --git a/lib/compiler/test/compiler.cover b/lib/compiler/test/compiler.cover
index 2be079944f..3fd7fc1937 100644
--- a/lib/compiler/test/compiler.cover
+++ b/lib/compiler/test/compiler.cover
@@ -1,5 +1,5 @@
 {incl_app,compiler,details}.
 
 %% -*- erlang -*-
-{excl_mods,compiler,[core_scan,core_parse,sys_pre_expand]}.
+{excl_mods,compiler,[core_scan,core_parse]}.