Merge branch 'PHP-5.4' into PHP-5.5

nikic · nikic · commit 686402a865d1 · 2013-08-23T13:28:59.000+02:00
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
@@ -58,10 +58,8 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 	}
 
 	if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
-		filename = dtrace_get_executed_filename(TSRMLS_C);
 		classname = get_active_class_name(&scope TSRMLS_CC);
 		funcname = get_active_function_name(TSRMLS_C);
-		lineno = zend_get_executed_lineno(TSRMLS_C);
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,8 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if (DTRACE_FUNCTION_ENTRY_ENABLED() \|\| DTRACE_FUNCTION_RETURN_ENABLED()) {`
`61`		`- filename = dtrace_get_executed_filename(TSRMLS_C);`
`62`	`61`	`classname = get_active_class_name(&scope TSRMLS_CC);`
`63`	`62`	`funcname = get_active_function_name(TSRMLS_C);`
`64`		`- lineno = zend_get_executed_lineno(TSRMLS_C);`
`65`	`63`	`}`
`66`	`64`
`67`	`65`	`if (DTRACE_EXECUTE_ENTRY_ENABLED()) {`