I suppose the easiest way would be to check op_array->function_name and op_array->scope->name. So something like this:

if (XG(context).do_finish) { / could still check level to try to skip some? /
int match = 0;
zend_string stmt_func_name = op_array->function_name;
zend_string stmt_scope_name = op_array->scope ? op_array->scope->name : NULL;
zend_string leave_func_name = XG(context).next_leave_function_name;
zend_string leave_scope_name = XG(context).next_leave_scope_name;

if (!stmt_func_name || !leave_func_name) {
match = stmt_func_name == leave_func_name;
} else if (zend_string_equals(stmt_func_name, leave_func_name)) {
if (!stmt_scope_name || !leave_scope_name) {
match = stmt_scope_name == leave_scope_name;
} else if (zend_string_equals(stmt_scope_name, leave_scope_name)) {
match = 1;
}
}

if (!match) {
/ break /
}
}

In a common case, I suppose the pointers would be identical, so it might not perform badly to simply refcount it. I'm not super familiar with the PHP source, though.

Also would need to check if that handles namespaces right.

-[Unknown]

Hmm, closures also - line_start might be necessary.

-[Unknown]

Fixed in Git for 2.5.1 by comparing the function numbers.