Merge branch 'maint'

* maint:
  erl_lint: Add a deprecated warning for literal tuple funs
  beam_utils:live_opt/1: Correct handling of try_case_end/1
  Correct guard_SUITE_tuple_size.S
  beam_type: Print the offending function if this pass crashes
  beam_validator: Validate the size operand in bs_init_bits and bs_init2

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 1e74ad7727..192268f90e 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -2969,12 +2969,14 @@ lookup1(Config) when is_list(Config) ->
                 [3] = lookup_keys(Q)
         end, [{1,a},{3,3}])">>,
 
+      {cres,
        <<"A = 3,
           etsc(fun(E) ->
                 Q = qlc:q([X || X <- ets:table(E), A =:= {erlang,element}(1, X)]),
                 [{3,3}] = qlc:e(Q),
                 [3] = lookup_keys(Q)
         end, [{1,a},{3,3}])">>,
+       {warnings,[{3,erl_lint,deprecated_tuple_fun}]}},
 
        <<"etsc(fun(E) ->
                 A = 3,
@@ -3439,12 +3441,14 @@ lookup2(Config) when is_list(Config) ->
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
+       {cres,
        <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
                                             {erlang,is_record}(X, r, 2)]),
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
+        {warnings,[{4,erl_lint,deprecated_tuple_fun}]}},
        {cres,
         <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
@@ -3465,12 +3469,14 @@ lookup2(Config) when is_list(Config) ->
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
+       {cres,
        <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
                                             {erlang,is_record}(X, r)]),
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
-         end, [{keypos,1}], [#r{}])">>
+         end, [{keypos,1}], [#r{}])">>,
+        {warnings,[{4,erl_lint,deprecated_tuple_fun}]}}
 
        ],
     ?line run(Config, <<"-record(r, {a}).\n">>, TsR),