diff options
author | Henrik Nord <henrik@erlang.org> | 2011-09-08 16:30:19 +0200 |
---|---|---|
committer | Henrik Nord <henrik@erlang.org> | 2011-09-08 16:30:23 +0200 |
commit | 4273aeda2b9e64efac72a4c381fe56cdb2927dc8 (patch) | |
tree | fd6af7443b78bb43530affaea3afd2c35e1ebf2e /lib | |
parent | 6ee4e2d478bfa34ccc11ac1c53a26d30fbe16cea (diff) | |
parent | 1b2cea397131a36a39b18c6ce8c6944bf11db4c7 (diff) | |
download | otp-4273aeda2b9e64efac72a4c381fe56cdb2927dc8.tar.gz otp-4273aeda2b9e64efac72a4c381fe56cdb2927dc8.tar.bz2 otp-4273aeda2b9e64efac72a4c381fe56cdb2927dc8.zip |
Merge branch 'fm/external_size_2' into dev
* fm/external_size_2:
Add erlang:external_size/2 BIF
OTP-9528
Diffstat (limited to 'lib')
-rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 82e3675938..acc7366d6b 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -739,6 +739,7 @@ type(erlang, element, 2, Xs) -> type(erlang, erase, 0, _) -> t_any(); type(erlang, erase, 1, _) -> t_any(); type(erlang, external_size, 1, _) -> t_integer(); +type(erlang, external_size, 2, _) -> t_integer(); type(erlang, finish_after_on_load, 2, Xs) -> %% Internal BIF used by on_load. strict(arg_types(erlang, finish_after_on_load, 2), Xs, @@ -3446,6 +3447,8 @@ arg_types(erlang, exit, 2) -> [t_sup(t_pid(), t_port()), t_any()]; arg_types(erlang, external_size, 1) -> [t_any()]; % takes any term as input +arg_types(erlang, external_size, 2) -> + [t_any(), t_list()]; % takes any term as input and a list of options arg_types(erlang, finish_after_on_load, 2) -> [t_atom(), t_boolean()]; arg_types(erlang, float, 1) -> |