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/icode/hipe_icode_type.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/icode/hipe_icode_type.erl')
| -rw-r--r-- | lib/hipe/icode/hipe_icode_type.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl index 3f9488d7c3..cae4325b9e 100644 --- a/lib/hipe/icode/hipe_icode_type.erl +++ b/lib/hipe/icode/hipe_icode_type.erl @@ -899,9 +899,7 @@ test_type0(list, T) -> test_type0(cons, T) -> t_is_cons(T); test_type0(nil, T) -> - t_is_nil(T); -test_type0(constant, T) -> - t_is_constant(T). + t_is_nil(T). true_branch_info(integer) -> @@ -940,8 +938,6 @@ true_branch_info(nil) -> t_nil(); true_branch_info(boolean) -> t_boolean(); -true_branch_info(constant) -> - t_constant(); true_branch_info(T) -> exit({?MODULE,unknown_typetest,T}). |