Merged pull request xdebug#1053

* pr/1053:
  Reimplement PR xdebug#1052 with normal style
  Add missing section comment

Author: derickr

src/base/base.c

@@ -1384,6 +1384,12 @@ void xdebug_base_rinit()
 	XG_BASE(last_eval_statement) = NULL;
 	XG_BASE(last_exception_trace) = NULL;
 
+	/* Enable statement handler only when needed */
+	XG_BASE(statement_handler_enabled) = false;
+	if (XDEBUG_MODE_IS(XDEBUG_MODE_COVERAGE) || XDEBUG_MODE_IS(XDEBUG_MODE_STEP_DEBUG)) {
+		XG_BASE(statement_handler_enabled) = true;
+	}
+
 	/* Initialize start time */
 	XG_BASE(start_nanotime) = xdebug_get_nanotime();
 
@@ -1425,6 +1431,7 @@ void xdebug_base_rinit()
 	XG_BASE(filters_stack)             = xdebug_llist_alloc(xdebug_llist_string_dtor);
 	XG_BASE(filters_tracing)           = xdebug_llist_alloc(xdebug_llist_string_dtor);
 
+	/* Warn about Private Temp Directory */
 	if (XG_BASE(private_tmp)) {
 		xdebug_log_ex(XLOG_CHAN_CONFIG, XLOG_INFO, "PRIVTMP", "Systemd Private Temp Directory is enabled (%s)", XG_BASE(private_tmp));
 	}

src/base/base_globals.h

@@ -56,6 +56,7 @@ typedef struct _xdebug_base_globals_t {
 	unsigned int  function_count;
 	zend_string  *last_eval_statement;
 	char         *last_exception_trace;
+	zend_bool     statement_handler_enabled;
 
 	/* in-execution checking */
 	zend_bool  in_execution;

xdebug.c

@@ -417,6 +417,7 @@ static void xdebug_init_base_globals(xdebug_base_globals_t *xg)
 	xg->in_var_serialisation = 0;
 	xg->error_reporting_override   = 0;
 	xg->error_reporting_overridden = 0;
+	xg->statement_handler_enabled  = false;
 
 	xg->filter_type_code_coverage = XDEBUG_FILTER_NONE;
 	xg->filter_type_stack         = XDEBUG_FILTER_NONE;
@@ -760,8 +761,8 @@ PHP_MINFO_FUNCTION(xdebug)
 
 ZEND_DLEXPORT void xdebug_statement_call(zend_execute_data *frame)
 {
-	zend_op_array *op_array = &frame->func->op_array;
-	int                   lineno;
+	zend_op_array *op_array;
+	int            lineno;
 
 	if (XDEBUG_MODE_IS_OFF()) {
 		return;
@@ -771,6 +772,15 @@ ZEND_DLEXPORT void xdebug_statement_call(zend_execute_data *frame)
 		return;
 	}
 
+#if HAVE_XDEBUG_CONTROL_SOCKET_SUPPORT
+	xdebug_control_socket_dispatch();
+#endif
+
+	if (!XG_BASE(statement_handler_enabled)) {
+		return;
+	}
+
+	op_array = &frame->func->op_array;
 	lineno = EG(current_execute_data)->opline->lineno;
 
 	if (XDEBUG_MODE_IS(XDEBUG_MODE_COVERAGE)) {
@@ -780,10 +790,6 @@ ZEND_DLEXPORT void xdebug_statement_call(zend_execute_data *frame)
 	if (XDEBUG_MODE_IS(XDEBUG_MODE_STEP_DEBUG)) {
 		xdebug_debugger_statement_call(op_array->filename, lineno);
 	}
-
-#if HAVE_XDEBUG_CONTROL_SOCKET_SUPPORT
-	xdebug_control_socket_dispatch();
-#endif
 }
 
 ZEND_DLEXPORT int xdebug_zend_startup(zend_extension *extension)