Merge branch 'bjorn/compiler/coverage-and-minor-fixes/OTP-9982' into maint

* bjorn/compiler/coverage-and-minor-fixes/OTP-9982:
  v3_life: Use common code for guards and bodies
  v3_core: Don't put negative line numbers in annotations
  v3_kernel: Dig out the line number only when generating a warning
  v3_kernel: Clean up handling of guards
  v3_kernel: Introduce is_in_guard/1
  v3_kernel: Removed unreached clause for #k_bin_int{} in sub_size_var/1
  v3_kernel: Remove unreached handling of #k_bin_int{} in arg_con/1
  v3_codegen: Eliminate the special case of 'put' without destination
  v3_kernel: Don't attempt to share identical literals
  v3_kernel: Handle sequences in guards
  v3_kernel: Remove clauses that are never executed in arg_val/1
  v3_kernel.hrl: Remove unused record #k_string{}
  v3_kernel.erl: Remove unused define of EXPENSIVE_BINARY_LIMIT
  sys_core_fold: Refactor previous_ctx_to_binary/2 to cover it completely
  sys_core_fold: Fix opt_guard_try/1
  sys_core_fold: Simplify opt_bool_not() to cover it completely
  sys_core_fold: Remove duplicate optimization

3 files changed, 88 insertions, 4 deletions

diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index 874e02803d..fd1539e7fd 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -22,7 +22,7 @@
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 dehydrated_itracer/1,nested_tries/1,
-	 make_effect_seq/1,eval_is_boolean/1,
+	 seq_in_guard/1,make_effect_seq/1,eval_is_boolean/1,
 	 unsafe_case/1,nomatch_shadow/1,reversed_annos/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -43,7 +43,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [dehydrated_itracer,nested_tries,make_effect_seq,
+    [dehydrated_itracer,nested_tries,seq_in_guard,make_effect_seq,
      eval_is_boolean,unsafe_case,nomatch_shadow,reversed_annos].
 
 groups() -> 
@@ -64,6 +64,7 @@ end_per_group(_GroupName, Config) ->
 
 ?comp(dehydrated_itracer).
 ?comp(nested_tries).
+?comp(seq_in_guard).
 ?comp(make_effect_seq).
 ?comp(eval_is_boolean).
 ?comp(unsafe_case).
diff --git a/lib/compiler/test/core_SUITE_data/seq_in_guard.core b/lib/compiler/test/core_SUITE_data/seq_in_guard.core
new file mode 100644
index 0000000000..44686a7187
--- /dev/null
+++ b/lib/compiler/test/core_SUITE_data/seq_in_guard.core
@@ -0,0 +1,66 @@
+module 'seq_in_guard' ['seq_in_guard'/0,
+		       't'/1]
+    attributes []
+'seq_in_guard'/0 =
+    %% Line 4
+    fun () ->
+	case <> of
+	  <> when 'true' ->
+	      let <_cor0> =
+		  catch
+		      %% Line 5
+		      apply 't'/1
+			  ({})
+	      in  %% Line 5
+		  case _cor0 of
+		    <{'EXIT',{'function_clause',_cor4}}> when 'true' ->
+			let <_cor2> =
+			    catch
+				%% Line 6
+				apply 't'/1
+				    ('atom')
+			in  %% Line 6
+			    case _cor2 of
+			      <{'EXIT',{'function_clause',_cor5}}> when 'true' ->
+				  %% Line 7
+				  apply 't'/1
+				      ({'a','b'})
+			      ( <_cor3> when 'true' ->
+				    primop 'match_fail'
+					({'badmatch',_cor3})
+				-| ['compiler_generated'] )
+			    end
+		    ( <_cor1> when 'true' ->
+			  primop 'match_fail'
+			      ({'badmatch',_cor1})
+		      -| ['compiler_generated'] )
+		  end
+	  ( <> when 'true' ->
+		( primop 'match_fail'
+		      ({'function_clause'})
+		  -| [{'function_name',{'seq_in_guard',0}}] )
+	    -| ['compiler_generated'] )
+	end
+'t'/1 =
+    %% Line 9
+    fun (_cor0) ->
+	case _cor0 of
+	  <X>
+	      when try
+		    do
+			call 'erlang':'element'
+			    (2, X)
+			'true'
+		of <Try> ->
+		    Try
+		catch <T,R> ->
+		    'false' ->
+	      %% Line 10
+	      'ok'
+	  ( <_cor3> when 'true' ->
+		( primop 'match_fail'
+		      ({'function_clause',_cor3})
+		  -| [{'function_name',{'t',1}}] )
+	    -| ['compiler_generated'] )
+	end
+end
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index fb5ec88c9f..54bd52947e 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -21,7 +21,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 t_element/1,setelement/1,t_length/1,append/1,t_apply/1,bifs/1,
-	 eq/1,nested_call_in_case/1,coverage/1]).
+	 eq/1,nested_call_in_case/1,guard_try_catch/1,coverage/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
@@ -32,7 +32,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     test_lib:recompile(?MODULE),
     [t_element, setelement, t_length, append, t_apply, bifs,
-     eq, nested_call_in_case, coverage].
+     eq, nested_call_in_case, guard_try_catch, coverage].
 
 groups() -> 
     [].
@@ -207,6 +207,23 @@ nested_call_in_case(Config) when is_list(Config) ->
     ?line {'EXIT',_} = (catch Mod:a(not_a_list, 42)),
     ok.
 
+guard_try_catch(_Config) ->
+    false = do_guard_try_catch(key, value),
+    value = get(key),
+    ok.
+
+do_guard_try_catch(K, V) ->
+    %% This try...catch block looks like a guard.
+    %% Make sure that it is not optimized like a guard
+    %% (the put/2 call must not be optimized away).
+    try
+	put(K, V),
+	false
+    catch
+	_:_ ->
+	    false
+    end.
+
 coverage(Config) when is_list(Config) ->
     ?line {'EXIT',{{case_clause,{a,b,c}},_}} =
 	(catch cover_will_match_list_type({a,b,c})),