diff options
author | Lukas Larsson <[email protected]> | 2016-10-12 16:29:01 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-10-12 16:29:01 +0200 |
commit | 885599a603fdf33f04125b6052f73d7c8e193d70 (patch) | |
tree | 9b0fd2da5ab637fa9f228a4384021a3312bc5d2a /erts/emulator/beam/erl_bif_op.c | |
parent | 83801d03ae4e3e157862eb51179c4c154795f976 (diff) | |
parent | c283f299551d53b62027ae1a8b189285c57573e8 (diff) | |
download | otp-885599a603fdf33f04125b6052f73d7c8e193d70.tar.gz otp-885599a603fdf33f04125b6052f73d7c8e193d70.tar.bz2 otp-885599a603fdf33f04125b6052f73d7c8e193d70.zip |
Merge branch 'lukas/erts/beam_func_info_struct/OTP-13821'
* lukas/erts/beam_func_info_struct/OTP-13821:
erts: Fix some dtrace related compile issues
erts: Refactor rename Export.code[] to Export.beam[]
erts: Improve printouts for some etp commands
erts: Fix erts_debug:df with new func_info
erts: Refactor find_function_from_pc to return MFA
erts: Refactor out func_info into struct
Diffstat (limited to 'erts/emulator/beam/erl_bif_op.c')
-rw-r--r-- | erts/emulator/beam/erl_bif_op.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_op.c b/erts/emulator/beam/erl_bif_op.c index aecb8bf0c1..a594ec1493 100644 --- a/erts/emulator/beam/erl_bif_op.c +++ b/erts/emulator/beam/erl_bif_op.c @@ -260,7 +260,7 @@ Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2) } else if (is_export(arg1)) { Export* exp = (Export *) (export_val(arg1)[1]); - if (exp->code[2] == (Uint) arity) { + if (exp->info.mfa.arity == (Uint) arity) { BIF_RET(am_true); } } |