aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-11-30 15:48:17 +0100
committerBjörn Gustavsson <[email protected]>2012-12-01 08:23:19 +0100
commit53ec991d193d5115b356d5850b6b1fae0ad71df6 (patch)
tree024e4529d7391a8e67484932bfcd8e0dcbad7792 /erts/emulator
parentc4d680549e11e116dcdd95ac29101ef3e54aba5f (diff)
downloadotp-53ec991d193d5115b356d5850b6b1fae0ad71df6.tar.gz
otp-53ec991d193d5115b356d5850b6b1fae0ad71df6.tar.bz2
otp-53ec991d193d5115b356d5850b6b1fae0ad71df6.zip
Teach is_function/2 that tuples are not funs
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_bif_op.c5
-rw-r--r--erts/emulator/test/fun_SUITE.erl4
2 files changed, 2 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_bif_op.c b/erts/emulator/beam/erl_bif_op.c
index 13f8b1f63c..d4cd9c89b3 100644
--- a/erts/emulator/beam/erl_bif_op.c
+++ b/erts/emulator/beam/erl_bif_op.c
@@ -261,11 +261,6 @@ Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2)
if (exp->code[2] == (Uint) arity) {
BIF_RET(am_true);
}
- } else if (is_tuple(arg1)) {
- Eterm* tp = tuple_val(arg1);
- if (tp[0] == make_arityval(2) && is_atom(tp[1]) && is_atom(tp[2])) {
- BIF_RET(am_true);
- }
}
BIF_RET(am_false);
}
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index ef06845cf2..36ba4e0f48 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -726,8 +726,8 @@ t_arity(Config) when is_list(Config) ->
ok.
t_is_function2(Config) when is_list(Config) ->
- ?line true = is_function({a,b}, 0),
- ?line true = is_function({a,b}, 234343434333433433),
+ false = is_function(id({a,b}), 0),
+ false = is_function(id({a,b}), 234343434333433433),
?line true = is_function(fun() -> ok end, 0),
?line true = is_function(fun(_) -> ok end, 1),
?line false = is_function(fun(_) -> ok end, 0),