Merge branch 'bjorn/erts/fix-hipe-crash/OTP-9886' into maint

* bjorn/erts/fix-hipe-crash/OTP-9886: Fix crash in trace_info({M,F,A}, Flags) when M:F/A has native code
spawnthink · Jan 26, 2012 · 9d2a2e3 · 9d2a2e3
2 parents 5f1e827 + 319bb88
commit 9d2a2e3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
@@ -1329,10 +1329,14 @@ static BpData *get_break(Process *p, BeamInstr *pc, BeamInstr break_op) {
 }
 
 static BpData *is_break(BeamInstr *pc, BeamInstr break_op) {
-    BpData **rs = (BpData **) pc[-4];
+    BpData **rs;
     BpData  *bd = NULL, *ebd = NULL;
     ASSERT(pc[-5] == (BeamInstr) BeamOp(op_i_func_info_IaaI));
 
+    if (erts_is_native_break(pc)) {
+	return NULL;
+    }
+    rs = (BpData **) pc[-4];
     if (! rs) {
 	return NULL;
     }