[[ Bug 13110 ]] Fix debugger triggering inside do (6.7 backport).

runrevmark · runrevmark · commit 8c3c66766da9 · 2015-03-03T16:56:15.000Z
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -249,7 +249,12 @@ void MCB_prepmessage(MCExecPoint &ep, MCNameRef mess, uint2 line, uint2 pos, uin
 void MCB_trace(MCExecPoint &ep, uint2 line, uint2 pos)
 {
 	uint2 i;
-
+    
+    // MW-2015-03-03: [[ Bug 13110 ]] If this is an internal handler as a result of do
+    //   then *don't* debug it.
+    if (ep . gethandler() -> getname() == MCM_message)
+        return;
+    
 	if (MCtrace && (MCtraceuntil == MAXUINT2 || MCnexecutioncontexts == MCtraceuntil))
 	{
 		MCtraceuntil = MAXUINT2;
@@ -265,9 +270,9 @@ void MCB_trace(MCExecPoint &ep, uint2 line, uint2 pos)
 			{
 				MCParentScriptUse *t_parentscript;
 				t_parentscript = ep . getparentscript();
-				if (t_parentscript == NULL && MCbreakpoints[i].object == ep.getobj() ||
-					t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject())
-				MCB_prepmessage(ep, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);
+				if ((t_parentscript == NULL && MCbreakpoints[i].object == ep.getobj()) ||
+					(t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject()))
+                    MCB_prepmessage(ep, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);
 			}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,12 @@ void MCB_prepmessage(MCExecPoint &ep, MCNameRef mess, uint2 line, uint2 pos, uin`
`249`	`249`	`void MCB_trace(MCExecPoint &ep, uint2 line, uint2 pos)`
`250`	`250`	`{`
`251`	`251`	`uint2 i;`
`252`		`-`
	`252`	`+`
	`253`	`+ // MW-2015-03-03: [[ Bug 13110 ]] If this is an internal handler as a result of do`
	`254`	`+ // then don't debug it.`
	`255`	`+ if (ep . gethandler() -> getname() == MCM_message)`
	`256`	`+ return;`
	`257`	`+`
`253`	`258`	`if (MCtrace && (MCtraceuntil == MAXUINT2 \|\| MCnexecutioncontexts == MCtraceuntil))`
`254`	`259`	`{`
`255`	`260`	`MCtraceuntil = MAXUINT2;`
`@@ -265,9 +270,9 @@ void MCB_trace(MCExecPoint &ep, uint2 line, uint2 pos)`
`265`	`270`	`{`
`266`	`271`	`MCParentScriptUse *t_parentscript;`
`267`	`272`	`t_parentscript = ep . getparentscript();`
`268`		`- if (t_parentscript == NULL && MCbreakpoints[i].object == ep.getobj() \|\|`
`269`		`- t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject())`
`270`		`- MCB_prepmessage(ep, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);`
	`273`	`+ if ((t_parentscript == NULL && MCbreakpoints[i].object == ep.getobj()) \|\|`
	`274`	`+ (t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject()))`
	`275`	`+ MCB_prepmessage(ep, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);`
`271`	`276`	`}`
`272`	`277`	`}`
`273`	`278`	`}`