Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand symbolic funs correctly #9246

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Expand symbolic funs correctly #9246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a34b2e7
Fix expansion of symbolic local funs
richcarl Dec 22, 2024
8fb9f1f
Better check for funs referring to imports
richcarl Dec 25, 2024
e88ee26
erl_lint: The checks for "old bifs" are no longer required
richcarl Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/compiler/test/error_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ bif_clashes(Config) when is_list(Config) ->
erlang:length(X).
">>,
[return_warnings],
{error,
[{{4,18}, erl_lint,{call_to_redefined_old_bif,{length,1}}}], []} }],
{warning,
[{{4,18}, erl_lint,{call_to_redefined_bif,{length,1}}}]} }],
[] = run(Config, Ts),
Ts1 = [{bif_clashes2,
<<"
Expand All @@ -75,8 +75,8 @@ bif_clashes(Config) when is_list(Config) ->
length([a,b,c]).
">>,
[return_warnings],
{error,
[{{3,16}, erl_lint,{redefine_old_bif_import,{length,1}}}], []} }],
{warning,
[{{3,16}, erl_lint,{redefine_bif_import,{length,1}}}]} }],
[] = run(Config, Ts1),
Ts00 = [{bif_clashes3,
<<"
Expand Down
2 changes: 2 additions & 0 deletions lib/dialyzer/src/erl_types.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@

-compile({no_auto_import,[min/2,max/2,map_get/2]}).

-compile({no_auto_import,[is_boolean/1, is_binary/1, is_number/1]}).

-export_type([erl_type/0, type_table/0, var_table/0, cache/0]).

%%-define(DEBUG, true).
Expand Down
36 changes: 28 additions & 8 deletions lib/stdlib/src/erl_expand_records.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,34 @@ expr({'receive',Anno,Cs0,To0,ToEs0}, St0) ->
{Cs,St3} = clauses(Cs0, St2),
{{'receive',Anno,Cs,To,ToEs},St3};
expr({'fun',Anno,{function,F,A}}=Fun0, St0) ->
case erl_internal:bif(F, A) of
true ->
{As,St1} = new_vars(A, Anno, St0),
Cs = [{clause,Anno,As,[],[{call,Anno,{atom,Anno,F},As}]}],
Fun = {'fun',Anno,{clauses,Cs}},
expr(Fun, St1);
false ->
{Fun0,St0}
FA = {F,A},
case St0#exprec.calltype of
#{FA := local} ->
{Fun0,St0};
#{FA := {imported,M}} ->
%% refers to another module, so keep it symbolic; do not create
%% a local fun which is subject to dynamic code replacement
MAtom = {atom,Anno,M},
FAtom = {atom,Anno,F},
AInt = {integer,Anno,A},
{{'fun',Anno,{function,MAtom,FAtom,AInt}},St0};
_ ->
case erl_internal:bif(F, A) of
true ->
%% auto-imported from the 'erlang' module;
%% handle like other imports above
MAtom = {atom,Anno,erlang},
FAtom = {atom,Anno,F},
AInt = {integer,Anno,A},
{{'fun',Anno,{function,MAtom,FAtom,AInt}},St0};
false ->
%% a generated function like module_info/0/1 or a
%% pseudo function; create a local fun wrapper
{As,St1} = new_vars(A, Anno, St0),
Cs = [{clause,Anno,As,[],[{call,Anno,{atom,Anno,F},As}]}],
Fun = {'fun',Anno,{clauses,Cs}},
expr(Fun, St1)
end
end;
expr({'fun',_,{function,_M,_F,_A}}=Fun, St) ->
{Fun,St};
Expand Down
132 changes: 1 addition & 131 deletions lib/stdlib/src/erl_internal.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ of interest to programmers who manipulate Erlang code.
%%

-export([bif/2,bif/3,guard_bif/2,
type_test/2,new_type_test/2,old_type_test/2,old_bif/2]).
type_test/2,new_type_test/2,old_type_test/2]).
-export([arith_op/2,bool_op/2,comp_op/2,list_op/2,send_op/2,op_type/2]).

-export([is_type/2]).
Expand Down Expand Up @@ -450,136 +450,6 @@ bif(unregister, 1) -> true;
bif(whereis, 1) -> true;
bif(Name, A) when is_atom(Name), is_integer(A) -> false.

-doc false.
-spec old_bif(Name::atom(), Arity::arity()) -> boolean().
%% Returns true if erlang:Name/Arity is an old (pre R14) auto-imported BIF, false otherwise.
%% Use erlang:is_bultin(Mod, Name, Arity) to find whether a function is a BIF
%% (meaning implemented in C) or not.

old_bif(abs, 1) -> true;
old_bif(apply, 2) -> true;
old_bif(apply, 3) -> true;
old_bif(atom_to_binary, 2) -> true;
old_bif(atom_to_list, 1) -> true;
old_bif(binary_to_atom, 2) -> true;
old_bif(binary_to_existing_atom, 2) -> true;
old_bif(binary_to_list, 1) -> true;
old_bif(binary_to_list, 3) -> true;
old_bif(binary_to_term, 1) -> true;
old_bif(bitsize, 1) -> true;
old_bif(bit_size, 1) -> true;
old_bif(bitstring_to_list, 1) -> true;
old_bif(byte_size, 1) -> true;
old_bif(check_process_code, 2) -> true;
old_bif(date, 0) -> true;
old_bif(delete_module, 1) -> true;
old_bif(disconnect_node, 1) -> true;
old_bif(element, 2) -> true;
old_bif(erase, 0) -> true;
old_bif(erase, 1) -> true;
old_bif(exit, 1) -> true;
old_bif(exit, 2) -> true;
old_bif(float, 1) -> true;
old_bif(float_to_list, 1) -> true;
old_bif(garbage_collect, 0) -> true;
old_bif(garbage_collect, 1) -> true;
old_bif(get, 0) -> true;
old_bif(get, 1) -> true;
old_bif(get_keys, 1) -> true;
old_bif(group_leader, 0) -> true;
old_bif(group_leader, 2) -> true;
old_bif(halt, 0) -> true;
old_bif(halt, 1) -> true;
old_bif(hd, 1) -> true;
old_bif(integer_to_list, 1) -> true;
old_bif(iolist_size, 1) -> true;
old_bif(iolist_to_binary, 1) -> true;
old_bif(is_alive, 0) -> true;
old_bif(is_process_alive, 1) -> true;
old_bif(is_atom, 1) -> true;
old_bif(is_boolean, 1) -> true;
old_bif(is_binary, 1) -> true;
old_bif(is_bitstring, 1) -> true;
old_bif(is_float, 1) -> true;
old_bif(is_function, 1) -> true;
old_bif(is_function, 2) -> true;
old_bif(is_integer, 1) -> true;
old_bif(is_list, 1) -> true;
old_bif(is_number, 1) -> true;
old_bif(is_pid, 1) -> true;
old_bif(is_port, 1) -> true;
old_bif(is_reference, 1) -> true;
old_bif(is_tuple, 1) -> true;
old_bif(is_record, 2) -> true;
old_bif(is_record, 3) -> true;
old_bif(length, 1) -> true;
old_bif(link, 1) -> true;
old_bif(list_to_atom, 1) -> true;
old_bif(list_to_binary, 1) -> true;
old_bif(list_to_bitstring, 1) -> true;
old_bif(list_to_existing_atom, 1) -> true;
old_bif(list_to_float, 1) -> true;
old_bif(list_to_integer, 1) -> true;
old_bif(list_to_pid, 1) -> true;
old_bif(list_to_tuple, 1) -> true;
old_bif(load_module, 2) -> true;
old_bif(make_ref, 0) -> true;
old_bif(module_loaded, 1) -> true;
old_bif(monitor_node, 2) -> true;
old_bif(node, 0) -> true;
old_bif(node, 1) -> true;
old_bif(nodes, 0) -> true;
old_bif(nodes, 1) -> true;
old_bif(now, 0) -> true;
old_bif(open_port, 2) -> true;
old_bif(pid_to_list, 1) -> true;
old_bif(port_close, 1) -> true;
old_bif(port_command, 2) -> true;
old_bif(port_connect, 2) -> true;
old_bif(port_control, 3) -> true;
old_bif(pre_loaded, 0) -> true;
old_bif(process_flag, 2) -> true;
old_bif(process_flag, 3) -> true;
old_bif(process_info, 1) -> true;
old_bif(process_info, 2) -> true;
old_bif(processes, 0) -> true;
old_bif(purge_module, 1) -> true;
old_bif(put, 2) -> true;
old_bif(register, 2) -> true;
old_bif(registered, 0) -> true;
old_bif(round, 1) -> true;
old_bif(self, 0) -> true;
old_bif(setelement, 3) -> true;
old_bif(size, 1) -> true;
old_bif(spawn, 1) -> true;
old_bif(spawn, 2) -> true;
old_bif(spawn, 3) -> true;
old_bif(spawn, 4) -> true;
old_bif(spawn_link, 1) -> true;
old_bif(spawn_link, 2) -> true;
old_bif(spawn_link, 3) -> true;
old_bif(spawn_link, 4) -> true;
old_bif(spawn_monitor, 1) -> true;
old_bif(spawn_monitor, 3) -> true;
old_bif(spawn_opt, 2) -> true;
old_bif(spawn_opt, 3) -> true;
old_bif(spawn_opt, 4) -> true;
old_bif(spawn_opt, 5) -> true;
old_bif(split_binary, 2) -> true;
old_bif(statistics, 1) -> true;
old_bif(term_to_binary, 1) -> true;
old_bif(term_to_binary, 2) -> true;
old_bif(throw, 1) -> true;
old_bif(time, 0) -> true;
old_bif(tl, 1) -> true;
old_bif(trunc, 1) -> true;
old_bif(tuple_size, 1) -> true;
old_bif(tuple_to_list, 1) -> true;
old_bif(unlink, 1) -> true;
old_bif(unregister, 1) -> true;
old_bif(whereis, 1) -> true;
old_bif(Name, A) when is_atom(Name), is_integer(A) -> false.

-doc false.
-spec is_type(Name, NumberOfTypeVariables) -> boolean() when
Name :: atom(),
Expand Down
53 changes: 20 additions & 33 deletions lib/stdlib/src/erl_lint.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ format_error_1({redefine_function,{F,A}}) ->
{~"function ~tw/~w already defined", [F,A]};
format_error_1({define_import,{F,A}}) ->
{~"defining imported function ~tw/~w", [F,A]};
format_error_1({fun_import,{F,A}}) ->
{~"creating a fun from imported name ~tw/~w is not allowed", [F,A]};
format_error_1({unused_function,{F,A}}) ->
{~"function ~tw/~w is unused", [F,A]};
format_error_1({unexported_function, MFA}) ->
Expand All @@ -355,16 +357,6 @@ format_error_1({call_to_redefined_bif,{F,A}}) ->
ambiguous call of overridden auto-imported BIF ~w/~w --
use erlang:~w/~w or "-compile({no_auto_import,[~w/~w]})." to resolve name clash
""", [F,A,F,A,F,A]};
format_error_1({call_to_redefined_old_bif,{F,A}}) ->
{~"""
ambiguous call of overridden pre Erlang/OTP R14 auto-imported BIF ~w/~w --
use erlang:~w/~w or \"-compile({no_auto_import,[~w/~w]}).\" to resolve name clash
""", [F,A,F,A,F,A]};
format_error_1({redefine_old_bif_import,{F,A}}) ->
{~"""
import directive overrides pre Erlang/OTP R14 auto-imported BIF ~w/~w --
use "-compile({no_auto_import,[~w/~w]})." to resolve name clash
""", [F,A,F,A]};
format_error_1({redefine_bif_import,{F,A}}) ->
{~"""
import directive overrides auto-imported BIF ~w/~w --
Expand Down Expand Up @@ -1828,13 +1820,7 @@ import(Anno, {Mod,Fs}, St00) ->
Warn = is_warn_enabled(bif_clash, St0) andalso
(not bif_clash_specifically_disabled(St0,{F,A})),
AutoImpSup = is_autoimport_suppressed(St0#lint.no_auto,{F,A}),
OldBif = erl_internal:old_bif(F,A),
{Err,if
Warn and (not AutoImpSup) and OldBif ->
add_error
(Anno,
{redefine_old_bif_import, {F,A}},
St0);
Warn and (not AutoImpSup) ->
add_warning
(Anno,
Expand Down Expand Up @@ -2751,13 +2737,23 @@ expr({'fun',Anno,Body}, Vt, St) ->
%% It is illegal to call record_info/2 with unknown arguments.
{[],add_error(Anno, illegal_record_info, St)};
{function,F,A} ->
%% BifClash - Fun expression
%% N.B. Only allows BIFs here as well, NO IMPORTS!!
case ((not is_local_function(St#lint.locals,{F,A})) andalso
(erl_internal:bif(F, A) andalso
(not is_autoimport_suppressed(St#lint.no_auto,{F,A})))) of
true -> {[],St};
false -> {[],call_function(Anno, F, A, St)}
St1 = case is_imported_function(St#lint.imports,{F,A}) of
true ->
add_error(Anno, {fun_import,{F,A}}, St);
false ->
%% check function use like for a call
As = lists:duplicate(A, undefined), % dummy args
check_call(Anno, F, As, Anno, St)
end,
%% do not mark as used as a local function if listed as
%% imported (either auto-imported or explicitly)
case not is_local_function(St1#lint.locals,{F,A}) andalso
(is_imported_function(St1#lint.imports,{F,A})
orelse
(erl_internal:bif(F, A) andalso
not is_autoimport_suppressed(St1#lint.no_auto,{F,A}))) of
true -> {[],St1};
false -> {[],call_function(Anno, F, A, St1)}
end;
{function, {atom, _, M}, {atom, _, F}, {integer, _, A}} ->
{[], check_unexported_function(Anno, M, F, A, St)};
Expand Down Expand Up @@ -2898,16 +2894,7 @@ check_call(Anno, F, As, _Aa, St0) ->
false ?= AutoSuppressed,
true ?= is_warn_enabled(bif_clash, St0),
false ?= bif_clash_specifically_disabled(St0, {F,A}),
case erl_internal:old_bif(F, A) of
true ->
add_error(Anno,
{call_to_redefined_old_bif, {F,A}},
St0);
false ->
add_warning(Anno,
{call_to_redefined_bif, {F,A}},
St0)
end
add_warning(Anno, {call_to_redefined_bif, {F,A}}, St0)
else
_ ->
St0
Expand Down
Loading
Loading