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 | |
| 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')
| -rw-r--r-- | lib/hipe/icode/hipe_beam_to_icode.erl | 4 | ||||
| -rw-r--r-- | lib/hipe/icode/hipe_icode_inline_bifs.erl | 3 | ||||
| -rw-r--r-- | lib/hipe/icode/hipe_icode_type.erl | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl index 992f387bd5..2d2b414a70 100644 --- a/lib/hipe/icode/hipe_beam_to_icode.erl +++ b/lib/hipe/icode/hipe_beam_to_icode.erl @@ -465,10 +465,6 @@ trans_fun([{test,is_nil,{f,Lbl},[Arg]}|Instructions], Env) -> trans_fun([{test,is_binary,{f,Lbl},[Arg]}|Instructions], Env) -> {Code,Env1} = trans_type_test(binary,Lbl,Arg,Env), [Code | trans_fun(Instructions,Env1)]; -%%--- is_constant --- -trans_fun([{test,is_constant,{f,Lbl},[Arg]}|Instructions], Env) -> - {Code,Env1} = trans_type_test(constant,Lbl,Arg,Env), - [Code | trans_fun(Instructions,Env1)]; %%--- is_list --- trans_fun([{test,is_list,{f,Lbl},[Arg]}|Instructions], Env) -> {Code,Env1} = trans_type_test(list,Lbl,Arg,Env), diff --git a/lib/hipe/icode/hipe_icode_inline_bifs.erl b/lib/hipe/icode/hipe_icode_inline_bifs.erl index 27296dcad5..9a2fb7846a 100644 --- a/lib/hipe/icode/hipe_icode_inline_bifs.erl +++ b/lib/hipe/icode/hipe_icode_inline_bifs.erl @@ -29,7 +29,7 @@ %% Currently inlined BIFs: %% and, or, xor, not, <, >, >=, =<, ==, /=, =/=, =:= -%% is_atom, is_boolean, is_binary, is_constant, is_float, is_function, +%% is_atom, is_boolean, is_binary, is_float, is_function, %% is_integer, is_list, is_pid, is_port, is_reference, is_tuple -module(hipe_icode_inline_bifs). @@ -131,7 +131,6 @@ is_type_test(Name) -> is_boolean -> {true, boolean}; is_function -> {true, function}; is_reference -> {true, reference}; - is_constant -> {true, constant}; is_port -> {true, port}; _ -> false end. 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}). |