Merge branch 'sverker/erts/trace-bif-session-fix/OTP-19840' into maint

Author: sverker

erts/emulator/beam/beam_bp.c

@@ -178,7 +178,8 @@ erts_bp_init(void) {
 
 
 void
-erts_bp_match_functions(BpFunctions* f, ErtsCodeMFA *mfa, int specified)
+erts_bp_match_functions(BpFunctions* f, ErtsCodeMFA *mfa, int specified,
+                        int ignore_bifs)
 {
     ErtsCodeIndex code_ix = erts_active_code_ix();
     Uint max_funcs = 0;
@@ -235,6 +236,15 @@ erts_bp_match_functions(BpFunctions* f, ErtsCodeMFA *mfa, int specified)
             case 0:
                 break;
             }
+
+            if (ignore_bifs) {
+                Export *ep = erts_active_export_entry(ci->mfa.module,
+                                                      ci->mfa.function,
+                                                      ci->mfa.arity);
+                if (ep && ep->bif_number >= 0) {
+                    continue;
+                }
+            }
             /* Store match */
             f->matching[i].code_info = ci;
             f->matching[i].mod = module[current];

erts/emulator/beam/beam_bp.h

@@ -136,7 +136,7 @@ void erts_commit_staged_bp(void);
 ERTS_GLB_INLINE ErtsBpIndex erts_active_bp_ix(void);
 ERTS_GLB_INLINE ErtsBpIndex erts_staging_bp_ix(void);
 
-void erts_bp_match_functions(BpFunctions* f, ErtsCodeMFA *mfa, int specified);
+void erts_bp_match_functions(BpFunctions* f, ErtsCodeMFA *mfa, int specified, int ignore_bifs);
 void erts_bp_match_export(BpFunctions* f, ErtsCodeMFA *mfa, int specified);
 void erts_bp_free_matched_functions(BpFunctions* f);
 

erts/emulator/beam/beam_debug.c

@@ -317,7 +317,8 @@ erts_debug_breakpoint_2(BIF_ALIST_2)
     ASSERT(erts_staging_trace_session == NULL);
     erts_staging_trace_session = &erts_trace_session_0;
 
-    erts_bp_match_functions(&finish_debug_bp.f, &mfa, specified);
+    erts_bp_match_functions(&finish_debug_bp.f, &mfa, specified,
+                            1); // ignore bifs
 
     ASSERT(finish_debug_bp.f.matched >= 0);
     ASSERT(finish_debug_bp.process == NULL);

erts/emulator/beam/erl_bif_trace.c

@@ -2422,7 +2422,7 @@ erts_set_trace_pattern(ErtsCodeMFA *mfa, int specified,
     /*
      * First do "local" code breakpoint tracing
      */
-    erts_bp_match_functions(&finish_bp.f, mfa, specified);
+    erts_bp_match_functions(&finish_bp.f, mfa, specified, 0);
 
     if (on) {
 	if (! flags.breakpoint) {
@@ -2555,7 +2555,7 @@ prepare_clear_all_trace_pattern(ErtsTraceSession* session)
     /*
      * Clear all breakpoints in code for session
      */
-    erts_bp_match_functions(&finish_bp.f, NULL, 0);
+    erts_bp_match_functions(&finish_bp.f, NULL, 0, 0);
     erts_clear_all_breaks(&finish_bp.f);
 
     clear_event_trace(erts_staging_trace_session->send_tracing);