Merge branch 'maint'

* maint:
  Update primary bootstrap
  HiPE: Remove support for is_constant/1
  erl_lint: Remove handling of constant/1
  erl_bif_types: Remove type for is_constant/1
  erl_eval: Remove support for is_constant/1
  Remove support for is_constant/1 in ms_transform
  Remove references to is_constant/1 from the match spec documentation

Conflicts:
	lib/hipe/cerl/erl_bif_types.erl

Also re-instate the type for erlang:is_boolean/1 which was
accidentally omitted in the master branch.

5 files changed, 3 insertions, 13 deletions

diff --git a/lib/hipe/cerl/cerl_hipe_primops.hrl b/lib/hipe/cerl/cerl_hipe_primops.hrl
index 36b1b62901..1d82f7bfc7 100644
--- a/lib/hipe/cerl/cerl_hipe_primops.hrl
+++ b/lib/hipe/cerl/cerl_hipe_primops.hrl
@@ -59,7 +59,6 @@
 -define(PRIMOP_IS_ATOM, 'is_atom').		% arity 1
 -define(PRIMOP_IS_BIGNUM, 'is_bignum').		% arity 1
 -define(PRIMOP_IS_BINARY, 'is_binary').		% arity 1
--define(PRIMOP_IS_CONSTANT, 'is_constant').	% arity 1
 -define(PRIMOP_IS_FIXNUM, 'is_fixnum').		% arity 1
 -define(PRIMOP_IS_FLOAT, 'is_float').		% arity 1
 -define(PRIMOP_IS_FUNCTION, 'is_function').	% arity 1
diff --git a/lib/hipe/cerl/cerl_hipeify.erl b/lib/hipe/cerl/cerl_hipeify.erl
index 8f6c3561c9..89b4ec147d 100644
--- a/lib/hipe/cerl/cerl_hipeify.erl
+++ b/lib/hipe/cerl/cerl_hipeify.erl
@@ -392,7 +392,6 @@ call_to_primop(erlang, '=<', 2) -> {yes, ?PRIMOP_LE};
 call_to_primop(erlang, '>=', 2) -> {yes, ?PRIMOP_GE};
 call_to_primop(erlang, is_atom, 1) -> {yes, ?PRIMOP_IS_ATOM};
 call_to_primop(erlang, is_binary, 1) -> {yes, ?PRIMOP_IS_BINARY};
-call_to_primop(erlang, is_constant, 1) -> {yes, ?PRIMOP_IS_CONSTANT};
 call_to_primop(erlang, is_float, 1) -> {yes, ?PRIMOP_IS_FLOAT};
 call_to_primop(erlang, is_function, 1) -> {yes, ?PRIMOP_IS_FUNCTION};
 call_to_primop(erlang, is_integer, 1) -> {yes, ?PRIMOP_IS_INTEGER};
diff --git a/lib/hipe/cerl/cerl_messagean.erl b/lib/hipe/cerl/cerl_messagean.erl
index 6dd93adaa3..b9f82f2a43 100644
--- a/lib/hipe/cerl/cerl_messagean.erl
+++ b/lib/hipe/cerl/cerl_messagean.erl
@@ -1083,7 +1083,6 @@ is_imm_op(erlang, is_alive, 0) -> true;
 is_imm_op(erlang, is_atom, 1) -> true;
 is_imm_op(erlang, is_binary, 1) -> true;
 is_imm_op(erlang, is_builtin, 3) -> true;
-is_imm_op(erlang, is_constant, 1) -> true;
 is_imm_op(erlang, is_float, 1) -> true;
 is_imm_op(erlang, is_function, 1) -> true;
 is_imm_op(erlang, is_integer, 1) -> true;
diff --git a/lib/hipe/cerl/cerl_to_icode.erl b/lib/hipe/cerl/cerl_to_icode.erl
index 362c427cbe..089e3f021e 100644
--- a/lib/hipe/cerl/cerl_to_icode.erl
+++ b/lib/hipe/cerl/cerl_to_icode.erl
@@ -88,7 +88,6 @@
 -define(TYPE_IS_ATOM, atom).
 -define(TYPE_IS_BIGNUM, bignum).
 -define(TYPE_IS_BINARY, binary).
--define(TYPE_IS_CONSTANT, constant).
 -define(TYPE_IS_FIXNUM, fixnum).
 -define(TYPE_IS_FLOAT, float).
 -define(TYPE_IS_FUNCTION, function).
@@ -2051,7 +2050,6 @@ is_record_test(T, A, N, True, False, Ctxt, Env, S) ->
 type_test(?PRIMOP_IS_ATOM) -> ?TYPE_IS_ATOM;
 type_test(?PRIMOP_IS_BIGNUM) -> ?TYPE_IS_BIGNUM;
 type_test(?PRIMOP_IS_BINARY) -> ?TYPE_IS_BINARY;
-type_test(?PRIMOP_IS_CONSTANT) -> ?TYPE_IS_CONSTANT;
 type_test(?PRIMOP_IS_FIXNUM) -> ?TYPE_IS_FIXNUM;
 type_test(?PRIMOP_IS_FLOAT) -> ?TYPE_IS_FLOAT;
 type_test(?PRIMOP_IS_FUNCTION) -> ?TYPE_IS_FUNCTION;
@@ -2082,7 +2080,6 @@ is_bool_op(Op, A) when is_atom(Op), is_integer(A) -> false.
 is_type_test(?PRIMOP_IS_ATOM, 1) -> true;
 is_type_test(?PRIMOP_IS_BIGNUM, 1) -> true;
 is_type_test(?PRIMOP_IS_BINARY, 1) -> true;
-is_type_test(?PRIMOP_IS_CONSTANT, 1) -> true;
 is_type_test(?PRIMOP_IS_FIXNUM, 1) -> true;
 is_type_test(?PRIMOP_IS_FLOAT, 1) -> true;
 is_type_test(?PRIMOP_IS_FUNCTION, 1) -> true;
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index b822f182c2..bb9dc44a0c 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -52,7 +52,6 @@
 		    t_cons/2,
 		    t_cons_hd/1,
 		    t_cons_tl/1,
-		    t_constant/0,
 		    t_fixnum/0,
 		    t_non_neg_fixnum/0,
 		    t_pos_fixnum/0,
@@ -77,7 +76,6 @@
 		    t_is_bitstr/1,
 		    t_is_boolean/1,
 		    t_is_cons/1,
-		    t_is_constant/1,
 		    t_is_float/1,
 		    t_is_float/1,
 		    t_is_fun/1,
@@ -584,11 +582,11 @@ type(erlang, is_bitstring, 1, Xs) ->
 	    check_guard(X, fun (Y) -> t_is_bitstr(Y) end, t_bitstr())
 	end,
   strict(arg_types(erlang, is_bitstring, 1), Xs, Fun);
-type(erlang, is_constant, 1, Xs) ->
+type(erlang, is_boolean, 1, Xs) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_constant(Y) end, t_constant())
+	    check_guard(X, fun (Y) -> t_is_boolean(Y) end, t_boolean())
 	end,
-  strict(arg_types(erlang, is_constant, 1), Xs, Fun);
+  strict(arg_types(erlang, is_boolean, 1), Xs, Fun);
 type(erlang, is_float, 1, Xs) ->
   Fun = fun (X) ->
 	    check_guard(X, fun (Y) -> t_is_float(Y) end, t_float())
@@ -2228,8 +2226,6 @@ arg_types(erlang, is_bitstring, 1) ->
   [t_any()];
 arg_types(erlang, is_boolean, 1) ->
   [t_any()];
-arg_types(erlang, is_constant, 1) ->
-  [t_any()];
 arg_types(erlang, is_float, 1) ->
   [t_any()];
 arg_types(erlang, is_function, 1) ->