diff options
| author | Björn Gustavsson <[email protected]> | 2012-02-09 13:29:24 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-02-09 13:29:24 +0100 |
| commit | 0b45f106f19756bcef0ee51a8f5d4147dc253bcb (patch) | |
| tree | 442a24fe05a9d2e998bd68e0060c7db77afb2d82 /lib/hipe/cerl/cerl_hipeify.erl | |
| parent | 4408f9f30a48fca6d51ecef6ba92ef2978f59e92 (diff) | |
| parent | 8ddf2aa53544e01b26d7fd55ef68f80f4af6307d (diff) | |
| download | otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.tar.gz otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.tar.bz2 otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.zip | |
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.
Diffstat (limited to 'lib/hipe/cerl/cerl_hipeify.erl')
| -rw-r--r-- | lib/hipe/cerl/cerl_hipeify.erl | 1 |
1 files changed, 0 insertions, 1 deletions
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}; |