2 files changed, 4 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) ->
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 2a350c1c39..d1243b2325 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -3235,6 +3235,8 @@ t_to_string(?bitstr(0, 0), _RecDict) ->
   "<<>>";
 t_to_string(?bitstr(8, 0), _RecDict) ->
   "binary()";
+t_to_string(?bitstr(1, 0), _RecDict) ->
+  "bitstring()";
 t_to_string(?bitstr(0, B), _RecDict) ->
   lists:flatten(io_lib:format("<<_:~w>>", [B]));
 t_to_string(?bitstr(U, 0), _RecDict) ->
@@ -3862,12 +3864,14 @@ t_form_to_string({type, _L, binary, [Base, Unit]} = Type) ->
       case {U, B} of
 	{0, 0} -> "<<>>";
 	{8, 0} -> "binary()";
+	{1, 0} -> "bitstring()";
 	{0, B} -> lists:flatten(io_lib:format("<<_:~w>>", [B]));
 	{U, 0} -> lists:flatten(io_lib:format("<<_:_*~w>>", [U]));
 	{U, B} -> lists:flatten(io_lib:format("<<_:~w,_:_*~w>>", [B, U]))
       end;
     _ -> io_lib:format("Badly formed bitstr type ~w", [Type])
   end;
+t_form_to_string({type, _L, bitstring, []}) -> "bitstring()";
 t_form_to_string({type, _L, 'fun', []}) -> "fun()";
 t_form_to_string({type, _L, 'fun', [{type, _, any}, Range]}) ->
   "fun(...) -> " ++ t_form_to_string(Range);