diff options
author | Sverker Eriksson <[email protected]> | 2012-08-29 15:59:50 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2012-08-29 15:59:50 +0200 |
commit | 02fd7f5c277ae599d52c9d618880de91a6fc2025 (patch) | |
tree | 6fc7bec4544861ccb8341a65a96f82e654d53ca1 /lib/hipe/cerl | |
parent | 702880c99b7fa85c3bc231c62f49174678ec7316 (diff) | |
parent | 293364854f6a404434bd221f4b64dcb4fb846bbf (diff) | |
download | otp-02fd7f5c277ae599d52c9d618880de91a6fc2025.tar.gz otp-02fd7f5c277ae599d52c9d618880de91a6fc2025.tar.bz2 otp-02fd7f5c277ae599d52c9d618880de91a6fc2025.zip |
Merge branch 'maint'
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'lib/hipe/cerl')
-rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 260ffeed48..776e336aea 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -2417,7 +2417,7 @@ arg_types(hipe_bifs, ref_get, 1) -> arg_types(hipe_bifs, ref_set, 2) -> [t_hiperef(), t_immediate()]; arg_types(hipe_bifs, remove_refs_from, 1) -> - [t_mfa()]; + [t_sup([t_mfa(), t_atom('all')])]; arg_types(hipe_bifs, set_funinfo_native_address, 3) -> arg_types(hipe_bifs, set_native_address, 3); arg_types(hipe_bifs, set_native_address, 3) -> |