Merged pull request xdebug#1037

Author: derickr

src/debugger/debugger.c

@@ -379,6 +379,20 @@ void xdebug_debugger_statement_call(zend_string *filename, int lineno)
 	/* Fetch top level fse */
 	fse = XDEBUG_VECTOR_TAIL(XG_BASE(stack));
 
+	/* If we're in a user-defined main function, with a valid function, with two or more opcodes,
+	 * with the current opcode to be the next-to-last one, and the last opcode being ZEND_RETURN,
+	 * and the value of ZEND_RETURN is a constant, and the value of ZEND_RETURN is the default, then bail out */
+	if (
+		fse->user_defined && (fse->function.type & XFUNC_INCLUDES) &&
+		/*EG(current_execute_data)->opline && */EG(current_execute_data)->func && /*EG(current_execute_data)->func->op_array && */
+		EG(current_execute_data)->func->op_array.last >= 2 &&
+		((EG(current_execute_data)->opline - EG(current_execute_data)->func->op_array.opcodes) == EG(current_execute_data)->func->op_array.last - 2) &&
+		EG(current_execute_data)->func->op_array.opcodes[EG(current_execute_data)->func->op_array.last - 1].opcode == ZEND_RETURN &&
+		EG(current_execute_data)->func->op_array.opcodes[EG(current_execute_data)->func->op_array.last - 1].op1_type == IS_CONST
+	) {
+		return;
+	}
+
 	XG_DBG(suppress_return_value_step) = 0;
 
 	if (XG_DBG(context).do_break) {

tests/debugger/maps/skip-vendor-directory/skip-vendor-directory.phpt

@@ -53,11 +53,11 @@ echo file_get_contents( $xdebugLogFileName );
 
 -> step_into -i 4
 <?xml version="1.0" encoding="iso-8859-1"?>
-<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="4" status="break" reason="ok"><xdebug:message filename="file://counter.inc" lineno="15"></xdebug:message></response>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="4" status="break" reason="ok"><xdebug:message filename="file://counter.inc" lineno="6"></xdebug:message></response>
 
 -> step_into -i 5
 <?xml version="1.0" encoding="iso-8859-1"?>
-<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="5" status="break" reason="ok"><xdebug:message filename="file://counter.inc" lineno="6"></xdebug:message></response>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="5" status="break" reason="ok"><xdebug:message filename="file://skip-vendor-directory.inc" lineno="7"></xdebug:message></response>
 %A
 [%d] [Path Mapping] INFO: Scanning for map files with pattern '%sdebugger%e.xdebug%e*.map'
 [%d] [Path Mapping] DEBUG: No map files found with pattern '%sdebugger%e.xdebug%e*.map'
@@ -74,12 +74,14 @@ echo file_get_contents( $xdebugLogFileName );
 [%d] [Path Mapping] INFO: Location %sautoload.inc:7 needs to be skipped
 [%d] [Path Mapping] INFO: Mapping location %scounter.inc:15
 [%d] [Path Mapping] INFO: Couldn't map location %sxdebug%ecounter.inc:15
-[%d] [Step Debug] -> <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="4" status="break" reason="ok"><xdebug:message filename="file://%scounter.inc" lineno="15"></xdebug:message></response>
-%A
-[%d] [Step Debug] <- step_into -i 5
 [%d] [Path Mapping] INFO: Mapping location %sautoload.inc:8
 [%d] [Path Mapping] INFO: Location %sautoload.inc:8 needs to be skipped
 [%d] [Path Mapping] INFO: Mapping location %scounter.inc:6
 [%d] [Path Mapping] INFO: Couldn't map location %scounter.inc:6
-[%d] [Step Debug] -> <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="5" status="break" reason="ok"><xdebug:message filename="file://%scounter.inc" lineno="6"></xdebug:message></response>
+[%d] [Step Debug] -> <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="4" status="break" reason="ok"><xdebug:message filename="file://%scounter.inc" lineno="6"></xdebug:message></response>
+%A
+[%d] [Step Debug] <- step_into -i 5
+[%d] [Path Mapping] INFO: Mapping location %sskip-vendor-directory.inc:7
+[%d] [Path Mapping] INFO: Couldn't map location %sskip-vendor-directory.inc:7
+[%d] [Step Debug] -> <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="5" status="break" reason="ok"><xdebug:message filename="file://%sskip-vendor-directory.inc" lineno="7"></xdebug:message></response>
 %A