aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-06-10 09:56:50 +0200
committerLukas Larsson <[email protected]>2013-06-10 09:56:50 +0200
commitbb399e7ab2d96edcaa0ff482bd51494848c1a248 (patch)
treeae4f57a788f310f87b9584925532074f3ef96008 /erts
parentf7c480076d34ff6666e9f15c992792817aab5078 (diff)
parentb22af34c26ced7b6d67536da1694083964fa4dd5 (diff)
downloadotp-bb399e7ab2d96edcaa0ff482bd51494848c1a248.tar.gz
otp-bb399e7ab2d96edcaa0ff482bd51494848c1a248.tar.bz2
otp-bb399e7ab2d96edcaa0ff482bd51494848c1a248.zip
Merge branch 'lukas/erts/gc_stat_contention/OTP-10271' into maint
* lukas/erts/gc_stat_contention/OTP-10271: erts: Update spec in preloaded to reflect success typing (again)
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/erlang.beambin94128 -> 94124 bytes
-rw-r--r--erts/preloaded/src/erlang.erl4
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index d977b237be..cdc13a656d 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 34785ff2a9..e016a50c4c 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -3554,8 +3554,8 @@ sched_wall_time(Ref, N, Acc) ->
{Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc])
end.
--spec erlang:gather_gc_info_result(Ref) -> [{number(),number(),0}] when
- Ref :: reference().
+-spec erlang:gather_gc_info_result(Ref) ->
+ {number(),number(),0} when Ref :: reference().
gather_gc_info_result(Ref) when erlang:is_reference(Ref) ->
gc_info(Ref, erlang:system_info(schedulers), {0,0}).