diff options
| author | Björn Gustavsson <[email protected]> | 2011-12-01 10:46:15 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-12-01 10:46:15 +0100 |
| commit | 1f6dd53f2c495d2bf28fbf519b5be636bd418ffd (patch) | |
| tree | 3ea7ef1fb5d87c7c71a19a608c44202ecc36617c | |
| parent | f597c0d9de1e8f7ffec0d63e07a6ae85eae3cd27 (diff) | |
| parent | 06664761fca25750e7881f4e6e6a0057da60cd4d (diff) | |
| download | otp-1f6dd53f2c495d2bf28fbf519b5be636bd418ffd.tar.gz otp-1f6dd53f2c495d2bf28fbf519b5be636bd418ffd.tar.bz2 otp-1f6dd53f2c495d2bf28fbf519b5be636bd418ffd.zip | |
Merge branch 'bjorn/dialyzer-warnings'
* bjorn/dialyzer-warnings:
erlang: Eliminate a clause in aa_mem_data/2 that can never match
Add type info for erlang:system_info({allocator_sizes,ref(),any()})
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 39568 -> 41124 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 | ||||
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex dda24d4405..a21e5c6e06 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index e9a59a7aaf..4affc9bffe 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1091,8 +1091,6 @@ receive_emd(Ref, EMD, N) -> receive_emd(Ref) -> receive_emd(Ref, #memory{}, erlang:system_info(schedulers)). -aa_mem_data(notsup, _) -> - notsup; aa_mem_data(#memory{} = Mem, [{maximum, Max} | Rest]) -> aa_mem_data(Mem#memory{maximum = Max}, diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 1483b2aee1..6f0141b0ca 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -3881,7 +3881,8 @@ arg_types(erlang, system_flag, 2) -> arg_types(erlang, system_info, 1) -> [t_sup([t_atom(), % documented t_tuple([t_atom(), t_any()]), % documented - t_tuple([t_atom(), t_atom(), t_any()])])]; + t_tuple([t_atom(), t_atom(), t_any()]), + t_tuple([t_atom(allocator_sizes), t_reference(), t_any()])])]; arg_types(erlang, system_monitor, 0) -> []; arg_types(erlang, system_monitor, 1) -> |