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/beam_emu.c | |
| 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/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 7b2aac0908..8991f7b198 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3413,6 +3413,7 @@ void process_main(void) r(0) = nif_bif_result; CHECK_TERM(r(0)); SET_I(c_p->cp); + c_p->cp = 0; Goto(*I); } else if (c_p->freason == TRAP) { SET_I(*((BeamInstr **) (UWord) ((c_p)->def_arg_reg + 3))); |