aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-02-14 15:44:39 +0100
committerLukas Larsson <[email protected]>2013-02-14 15:44:39 +0100
commit67eca074f81f00724125c3c868201ee7df3cf842 (patch)
tree672b44c68bfad998ff3d4f6f82d9b56dc91b8a77 /lib/hipe
parent15a41e9ef18f093b5ed46c4b9bece3c71eabe30f (diff)
parent2f3526bb1c4c915a8528cd7d36c3a5b793e0ca3f (diff)
downloadotp-67eca074f81f00724125c3c868201ee7df3cf842.tar.gz
otp-67eca074f81f00724125c3c868201ee7df3cf842.tar.bz2
otp-67eca074f81f00724125c3c868201ee7df3cf842.zip
Merge branch 'lukas/erts/binary_conv_bifs/OTP-10300'
* lukas/erts/binary_conv_bifs/OTP-10300: erts: Remove ?line macro from hash_SUITE Add float_to_binary and binary_to_float Add new binary conversion bifs
Diffstat (limited to 'lib/hipe')
-rw-r--r--lib/hipe/cerl/erl_bif_types.erl5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index d93ad10bd4..028676bfd3 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -736,9 +736,6 @@ type(erlang, is_tuple, 1, Xs) ->
%% Guard bif, needs to be here.
type(erlang, length, 1, Xs) ->
strict(arg_types(erlang, length, 1), Xs, fun (_) -> t_non_neg_fixnum() end);
-type(erlang, list_to_integer, 2, Xs) ->
- strict(arg_types(erlang, list_to_integer, 2), Xs,
- fun (_) -> t_integer() end);
type(erlang, make_tuple, 2, Xs) ->
strict(arg_types(erlang, make_tuple, 2), Xs,
fun ([Int, _]) ->
@@ -2231,8 +2228,6 @@ arg_types(erlang, is_tuple, 1) ->
%% Guard bif, needs to be here.
arg_types(erlang, length, 1) ->
[t_list()];
-arg_types(erlang, list_to_integer, 2) ->
- [t_list(t_byte()), t_from_range(2, 36)];
arg_types(erlang, make_tuple, 2) ->
[t_non_neg_fixnum(), t_any()]; % the value 0 is OK as first argument
arg_types(erlang, make_tuple, 3) ->