diff options
author | Björn-Egil Dahlberg <[email protected]> | 2014-08-21 16:32:52 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2014-08-21 16:32:52 +0200 |
commit | ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9 (patch) | |
tree | 4b9f103d907d336a45cc4efe1e8f59d95ec29ec1 /lib/stdlib/src/proc_lib.erl | |
parent | cffe162d9ddce58b2aaf71a102f3b6c6738a2029 (diff) | |
parent | e2148351cd40a8affacf6fc0589448d15bc603f7 (diff) | |
download | otp-ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9.tar.gz otp-ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9.tar.bz2 otp-ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9.zip |
Merge branch 'egil/proc_lib-optimizations/OTP-12060' into maint
* egil/proc_lib-optimizations/OTP-12060:
stdlib: Update dependencies to erts-6.2
erts: Update preloaded erlang.beam
stdlib: Use erlang:fun_info_mfa/1 in proc_lib:init_p/3
erts: Test erlang:fun_info_mfa/1
erts: Introduce erlang:fun_info_mfa/1
Diffstat (limited to 'lib/stdlib/src/proc_lib.erl')
-rw-r--r-- | lib/stdlib/src/proc_lib.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl index 1eb6fc2e86..bf2a4e7ac5 100644 --- a/lib/stdlib/src/proc_lib.erl +++ b/lib/stdlib/src/proc_lib.erl @@ -216,10 +216,8 @@ ensure_link(SpawnOpts) -> init_p(Parent, Ancestors, Fun) when is_function(Fun) -> put('$ancestors', [Parent|Ancestors]), - {module,Mod} = erlang:fun_info(Fun, module), - {name,Name} = erlang:fun_info(Fun, name), - {arity,Arity} = erlang:fun_info(Fun, arity), - put('$initial_call', {Mod,Name,Arity}), + Mfa = erlang:fun_info_mfa(Fun), + put('$initial_call', Mfa), try Fun() catch |