Merge branch 'bjorn/lc-overridden-bif/OTP-13690'

* bjorn/lc-overridden-bif/OTP-13690:
  Fix overridden BIFs
  Don't crash when obsolete guard overrides local function

2 files changed, 28 insertions, 3 deletions

diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index d916eb3eef..4ee3950882 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1554,7 +1554,15 @@ guard(Config) when is_list(Config) ->
             [],
             {errors,[{1,erl_lint,illegal_guard_expr},
                      {2,erl_lint,illegal_guard_expr}],
-             []}}
+             []}},
+           {guard10,
+            <<"is_port(_) -> false.
+               t(P) when port(P) -> ok.
+            ">>,
+            [],
+            {error,
+	     [{2,erl_lint,{obsolete_guard_overridden,port}}],
+	     [{2,erl_lint,{obsolete_guard,{port,1}}}]}}
 	  ],
     [] = run(Config, Ts1),
     ok.
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 2bd940020c..8c7d5a5fcf 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -58,7 +58,7 @@
 -export([ 
 	  badarg/1, nested_qlc/1, unused_var/1, lc/1, fun_clauses/1,
 	  filter_var/1, single/1, exported_var/1, generator_vars/1,
-	  nomatch/1, errors/1, pattern/1, 
+	  nomatch/1, errors/1, pattern/1, overridden_bif/1,
 
 	  eval/1, cursor/1, fold/1, eval_unique/1, eval_cache/1, append/1, 
 	  evaluator/1, string_to_handle/1, table/1, process_dies/1, 
@@ -126,7 +126,7 @@ groups() ->
     [{parse_transform, [],
       [badarg, nested_qlc, unused_var, lc, fun_clauses,
        filter_var, single, exported_var, generator_vars,
-       nomatch, errors, pattern]},
+       nomatch, errors, pattern, overridden_bif]},
      {evaluation, [],
       [eval, cursor, fold, eval_unique, eval_cache, append,
        evaluator, string_to_handle, table, process_dies, sort,
@@ -468,6 +468,23 @@ pattern(Config) when is_list(Config) ->
                          -record(k, {t,v}).\n">>, Ts),
     ok.
 
+%% Override a guard BIF with an imported or local function.
+overridden_bif(Config) ->
+    Ts = [
+	  <<"[2] = qlc:e(qlc:q([P || P <- [1,2,3], port(P)])),
+             [10] = qlc:e(qlc:q([P || P <- [0,9,10,11,12],
+                                      (is_reference(P) andalso P > 5)])),
+             Empty = gb_sets:empty(), Single = gb_sets:singleton(42),
+             GbSets = [Empty,Single],
+             [Single] = qlc:e(qlc:q([S || S <- GbSets, size(S) =/= 0]))
+            ">>
+	 ],
+    run(Config, "-import(gb_sets, [size/1]).
+                 -compile({no_auto_import, [size/1, is_reference/1]}).
+                 port(N) -> N rem 2 =:= 0.
+                 is_reference(N) -> N rem 10 =:= 0.\n", Ts),
+    ok.
+
 
 %% eval/2
 eval(Config) when is_list(Config) ->