diff options
author | Björn Gustavsson <[email protected]> | 2011-03-30 10:41:34 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2011-03-30 10:41:34 +0200 |
commit | ef204e43651715e55ae902176b29026914900cc2 (patch) | |
tree | d47d39bcca05ff6dab9b27f85ba76761015340b5 /erts/emulator/beam/ops.tab | |
parent | 0bc5994c5aa4001e8a3b63548c7dd735064ecb4d (diff) | |
parent | 9104dc674c265b82728a1b494194fdeea4ad6661 (diff) | |
download | otp-ef204e43651715e55ae902176b29026914900cc2.tar.gz otp-ef204e43651715e55ae902176b29026914900cc2.tar.bz2 otp-ef204e43651715e55ae902176b29026914900cc2.zip |
Merge branch 'bjorn/erts/fix-duplicate-stack-entry/OTP-9163' into dev
* bjorn/erts/fix-duplicate-stack-entry/OTP-9163:
Fix duplicate entries in stacktraces after calling certain BIFs
BEAM loader: Simplify handling of the func_info/3 instruction
Diffstat (limited to 'erts/emulator/beam/ops.tab')
-rw-r--r-- | erts/emulator/beam/ops.tab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index e861f97e7a..6caa1e0b2d 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -1066,7 +1066,7 @@ is_function f y is_function f r is_function Fail=f c => jump Fail -func_info M=a F=a A=u | label L => gen_func_info(M, F, A, L) +func_info M F A => i_func_info u M F A # ================================================================ # New bit syntax matching (R11B). |