diff options
| author | John Högberg <john@erlang.org> | 2019-09-19 10:09:47 +0200 |
|---|---|---|
| committer | John Högberg <john@erlang.org> | 2019-09-19 10:09:47 +0200 |
| commit | 8c2badd69e163f7b4261dce242344f7f7af213b3 (patch) | |
| tree | a1c9ffa72319f34df5ac2fd3692a619133bffa21 /erts/emulator/beam/erl_bif_info.c | |
| parent | e0bd1d7ba2ed63b38cd068dbe619f023b041407f (diff) | |
| parent | 5943680509c0469a1a43c27dc892536f4ea7f4a3 (diff) | |
| download | erlang-8c2badd69e163f7b4261dce242344f7f7af213b3.tar.gz | |
Merge branch 'john/erts/hide-cif-trapping'
* john/erts/hide-cif-trapping:
erts: Use global trap entries for lists
erts: Rename bif_table_index to bif_number
erts: Use hidden exports for BIF trapping
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 57fc5ec131..43be78715b 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -1250,9 +1250,9 @@ exited: yield: if (pi2) - ERTS_BIF_PREP_YIELD2(ret, bif_export[BIF_process_info_2], c_p, pid, opt); + ERTS_BIF_PREP_YIELD2(ret, &bif_trap_export[BIF_process_info_2], c_p, pid, opt); else - ERTS_BIF_PREP_YIELD1(ret, bif_export[BIF_process_info_1], c_p, pid); + ERTS_BIF_PREP_YIELD1(ret, &bif_trap_export[BIF_process_info_1], c_p, pid); goto done; send_signal: { @@ -4596,7 +4596,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) if (!flag && BIF_ARG_2 != am_false) { erts_atomic_set_nob(&hipe_test_reschedule_flag, 1); erts_suspend(BIF_P, ERTS_PROC_LOCK_MAIN, NULL); - ERTS_BIF_YIELD2(bif_export[BIF_erts_debug_set_internal_state_2], + ERTS_BIF_YIELD2(&bif_trap_export[BIF_erts_debug_set_internal_state_2], BIF_P, BIF_ARG_1, BIF_ARG_2); } erts_atomic_set_nob(&hipe_test_reschedule_flag, !flag); |