diff options
| author | Micael Karlberg <[email protected]> | 2011-04-01 12:07:23 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-01 12:07:23 +0200 |
| commit | 2b46b0e42fe95d99619ffa343537c8468e27295c (patch) | |
| tree | 9f01a4f4a6ad597299aa5a74e5e50a58e9d5812b /erts/emulator/beam/beam_emu.c | |
| parent | 537f010d6fe871d55c3becb02fe6ebb73dc2d55a (diff) | |
| parent | 49737813349f164b35737eb3cd59491930128f58 (diff) | |
| download | otp-2b46b0e42fe95d99619ffa343537c8468e27295c.tar.gz otp-2b46b0e42fe95d99619ffa343537c8468e27295c.tar.bz2 otp-2b46b0e42fe95d99619ffa343537c8468e27295c.zip | |
Merge branch 'bmk/snmp/manager/deprecate_old_api/OTP-9174' into bmk/snmp/snmp420_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
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))); |