@@ -0,0 +1,33 @@
+--TEST--
+Test for bug #1571: Stack traces don't show file/line for closures in namespaces
+--INI--
+xdebug.default_enable=1
+xdebug.auto_trace=0
+xdebug.collect_params=4
+xdebug.collect_return=1
+xdebug.collect_assignments=0
+xdebug.auto_profile=0
+xdebug.profiler_enable=0
+xdebug.show_mem_delta=0
+xdebug.trace_format=0
+--FILE--
+<?php
+namespace A;
+
+$tf = xdebug_start_trace(sys_get_temp_dir() . '/'. uniqid('xdt', TRUE));
+
+$a = function(){
+
+};
+$a(1, $a);
+
+xdebug_stop_trace();
+echo file_get_contents($tf);
+unlink($tf);
+?>
+--EXPECTF--
+TRACE START [%d-%d-%d %d:%d:%d]
+%w%f %w%d     -> A\{closure:%sbug01571-001.php:6-8}(1, class Closure {  }) %sbug01571-001.php:9
+%w%f %w%d     -> xdebug_stop_trace() %sbug01571-001.php:11
+%w%f %w%d
+TRACE END   [%d-%d-%d %d:%d:%d]
@@ -0,0 +1,6 @@
+<?php
+namespace Testing;
+
+$cb = function($a) { usleep(500); return $a * 3; };
+$cb(4);
+?>
@@ -0,0 +1,42 @@
+--TEST--
+Test for bug #1571: Profiler doesn't show file/line for closures in namespaces
+--INI--
+xdebug.profiler_enable=1
+--FILE--
+<?php
+require_once('bug01571-002.inc');
+ 
+echo file_get_contents(xdebug_get_profiler_filename());
+?>
+--EXPECTF--
+version: 1
+creator: xdebug %d.%s (PHP %s)
+cmd: %sbug01571-002.php
+part: 1
+positions: line
+
+events: Time Memory
+
+fl=(1) php:internal
+fn=(1) php::usleep
+4 %d %i
+
+fl=(2) %sbug01571-002.inc
+fn=(2) Testing\{closure:%sbug01571-002.inc:4-4}
+4 %d %i
+cfl=(1)
+cfn=(1)
+calls=1 0 0
+4 %d %i
+
+fl=(2)
+fn=(3) require_once::%sbug01571-002.inc
+1 %d %i
+cfl=(2)
+cfn=(2)
+calls=1 0 0
+5 %d %i
+
+fl=(1)
+fn=(4) php::xdebug_get_profiler_filename
+4 %d %i
@@ -0,0 +1,30 @@
+--TEST--
+Test for bug #1571: Code Coverage doesn't show file/line for closures in namespaces
+--INI--
+xdebug.default_enable=1
+xdebug.auto_trace=0
+xdebug.auto_profile=0
+xdebug.profiler_enable=0
+xdebug.overload_var_dump=0
+--FILE--
+<?php
+namespace Testing;
+
+$pathname = stream_resolve_include_path(__FILE__);
+xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE | XDEBUG_CC_BRANCH_CHECK);
+
+$cb = function($a) {
+	usleep(500);
+	return $a * 3;
+};
+$cb(4);
+
+$coverage = xdebug_get_code_coverage();
+xdebug_stop_code_coverage();
+print_r(array_keys($coverage[$pathname]['functions']));
+?>
+--EXPECTF--
+Array
+(
+    [0] => Testing\{closure:%sbug01571-003.php:7-10}
+)
@@ -757,13 +757,8 @@ void xdebug_build_fname_from_oparray(xdebug_func *tmp, zend_op_array *opa TSRMLS
 	memset(tmp, 0, sizeof(xdebug_func));
 
 	if (opa->function_name) {
-		if (strcmp(STR_NAME_VAL(opa->function_name), "{closure}") == 0) {
-			tmp->function = xdebug_sprintf(
-				"{closure:%s:%d-%d}",
-				STR_NAME_VAL(opa->filename),
-				opa->line_start,
-				opa->line_end
-			);
+		if (xdebug_function_name_is_closure(STR_NAME_VAL(opa->function_name))) {
+			tmp->function = xdebug_wrap_closure_location_around_function_name(opa, STR_NAME_VAL(opa->function_name));
 			closure = 1;
 		} else {
 			tmp->function = xdstrdup(STR_NAME_VAL(opa->function_name));
 
@@ -952,6 +952,40 @@ static int find_line_number_for_current_execute_point(zend_execute_data *edata T
 	return 0;
 }
 
+int xdebug_function_name_is_closure(char *fname)
+{
+	int length = strlen(fname);
+	int closure_length = strlen("{closure}");
+
+	if (length < closure_length) {
+		return 0;
+	}
+
+	if (strcmp(fname + length - closure_length, "{closure}") == 0) {
+		return 1;
+	}
+
+	return 0;
+}
+
+char* xdebug_wrap_closure_location_around_function_name(zend_op_array *opa, char *fname)
+{
+	xdebug_str tmp = XDEBUG_STR_INITIALIZER;
+	char *tmp_loc_info;
+
+	xdebug_str_addl(&tmp, fname, strlen(fname) - 1, 0);
+
+	tmp_loc_info = xdebug_sprintf(
+		":%s:%d-%d}",
+		opa->filename->val,
+		opa->line_start,
+		opa->line_end
+	);
+	xdebug_str_add(&tmp, tmp_loc_info, 1);
+
+	return tmp.d;
+}
+
 void xdebug_build_fname(xdebug_func *tmp, zend_execute_data *edata TSRMLS_DC)
 {
 	memset(tmp, 0, sizeof(xdebug_func));
@@ -988,13 +1022,8 @@ void xdebug_build_fname(xdebug_func *tmp, zend_execute_data *edata TSRMLS_DC)
 			}
 		}
 		if (edata->func->common.function_name) {
-			if (strcmp(edata->func->common.function_name->val, "{closure}") == 0) {
-				tmp->function = xdebug_sprintf(
-					"{closure:%s:%d-%d}",
-					edata->func->op_array.filename->val,
-					edata->func->op_array.line_start,
-					edata->func->op_array.line_end
-				);
+			if (xdebug_function_name_is_closure(edata->func->common.function_name->val)) {
+				tmp->function = xdebug_wrap_closure_location_around_function_name(&edata->func->op_array, edata->func->common.function_name->val);
 			} else if (strncmp(edata->func->common.function_name->val, "call_user_func", 14) == 0) {
 				const char *fname = NULL;
 				int         lineno = 0;
 
@@ -23,6 +23,8 @@
 
 #define XDEBUG_STACK_NO_DESC 0x01
 
+int xdebug_function_name_is_closure(char *fname);
+char* xdebug_wrap_closure_location_around_function_name(zend_op_array *opa, char *fname);
 void xdebug_build_fname(xdebug_func *tmp, zend_execute_data *edata TSRMLS_DC);
 function_stack_entry *xdebug_add_stack_frame(zend_execute_data *zdata, zend_op_array *op_array, int type TSRMLS_DC);
 void xdebug_append_error_head(xdebug_str *str, int html, const char *error_type_str TSRMLS_DC);
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
 +namespace Testing;
++
 +$cb = function($a) { usleep(500); return $a * 3; };
 +$cb(4);
 +?>