diff options
| author | Rickard Green <[email protected]> | 2016-08-29 18:39:21 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-29 18:39:21 +0200 |
| commit | b815d568e2e43d96698dbb8de6b993d55c1b14a0 (patch) | |
| tree | a2ecbfa7529ea14fb6376882c8bcbcbfc36509b8 /erts/emulator/beam/beam_emu.c | |
| parent | 5006f1e0c45d4e9b888b2c0ca48130049d33074c (diff) | |
| parent | c429c3d042ba274d4225a6d79b2f1df8cfd19983 (diff) | |
| download | otp-b815d568e2e43d96698dbb8de6b993d55c1b14a0.tar.gz otp-b815d568e2e43d96698dbb8de6b993d55c1b14a0.tar.bz2 otp-b815d568e2e43d96698dbb8de6b993d55c1b14a0.zip | |
Merge branch 'rickard/ds-trace/OTP-13822' into maint
* rickard/ds-trace/OTP-13822:
Fix tracing of processes executing dirty
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index ac8dd85b46..073b7e39b6 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -5382,7 +5382,7 @@ void erts_dirty_process_main(ErtsSchedulerData *esdp) ASSERT(!c_p->scheduler_data); erts_pre_dirty_nif(esdp, &env, c_p, - (struct erl_module_nif*)I[2], NULL); + (struct erl_module_nif*)I[2]); #ifdef DEBUG result = @@ -5391,7 +5391,7 @@ void erts_dirty_process_main(ErtsSchedulerData *esdp) #endif (*fp)(&env, arity, reg); - erts_post_nif(&env); + erts_post_dirty_nif(&env); ASSERT(!is_value(result)); ASSERT(c_p->freason == TRAP); |