Merge branch 'sverker/ets-delete_all_objects-trap/OTP-15078'

* sverker/ets-delete_all_objects-trap/OTP-15078:
  erts: Rename untrapping db_free_*empty*_table
  erts: Make ets:delete_all_objects yield on fixed table
  erts: Optimize ets delete all in fixed table
  erts: Refactor ets select iteration code
  erts: Cleanup ets code
  erts: Optimize ets hash object deallocactions
  erts: Refactor pseudo deleted ets objects
  erts: Make atomic ets:delete_all_objects yield
  erts: Fix reduction bump for ets:delete/1

1 files changed, 8 insertions, 1 deletions

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 55450e397f..8b2b1a58c7 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -4682,7 +4682,14 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
                                             refbin));
             }
         }
-
+        else if (ERTS_IS_ATOM_STR("ets_force_trap", BIF_ARG_1)) {
+#ifdef ETS_DBG_FORCE_TRAP
+            erts_ets_dbg_force_trap = (BIF_ARG_2 == am_true) ? 1 : 0;
+            BIF_RET(am_ok);
+#else
+            BIF_RET(am_notsup);
+#endif
+        }
     }
 
     BIF_ERROR(BIF_P, BADARG);