Merge branch 'PHP-8.3'

* PHP-8.3:
  Revert "Skip profiling of sqlite3_step"

Author: iluuu1994

ext/pdo_sqlite/sqlite_statement.c

@@ -26,9 +26,6 @@
 #include "php_pdo_sqlite.h"
 #include "php_pdo_sqlite_int.h"
 
-#ifdef HAVE_VALGRIND
-# include "valgrind/callgrind.h"
-#endif
 
 static int pdo_sqlite_stmt_dtor(pdo_stmt_t *stmt)
 {
@@ -51,14 +48,7 @@ static int pdo_sqlite_stmt_execute(pdo_stmt_t *stmt)
 	}
 
 	S->done = 0;
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
-	int result = sqlite3_step(S->stmt);
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
-	switch (result) {
+	switch (sqlite3_step(S->stmt)) {
 		case SQLITE_ROW:
 			S->pre_fetched = 1;
 			php_pdo_stmt_set_column_count(stmt, sqlite3_data_count(S->stmt));
@@ -224,13 +214,7 @@ static int pdo_sqlite_stmt_fetch(pdo_stmt_t *stmt,
 	if (S->done) {
 		return 0;
 	}
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 	i = sqlite3_step(S->stmt);
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 	switch (i) {
 		case SQLITE_ROW:
 			return 1;

ext/sqlite3/sqlite3.c

@@ -31,10 +31,6 @@
 #include "SAPI.h"
 #include "sqlite3_arginfo.h"
 
-#ifdef HAVE_VALGRIND
-# include "valgrind/callgrind.h"
-#endif
-
 ZEND_DECLARE_MODULE_GLOBALS(sqlite3)
 
 static PHP_GINIT_FUNCTION(sqlite3);
@@ -599,14 +595,7 @@ PHP_METHOD(SQLite3, query)
 	result->column_count = -1;
 	ZVAL_OBJ(&result->stmt_obj_zval, Z_OBJ(stmt));
 
-
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 	return_code = sqlite3_step(result->stmt_obj->stmt);
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 
 	switch (return_code) {
 		case SQLITE_ROW: /* Valid Row */
@@ -708,13 +697,7 @@ PHP_METHOD(SQLite3, querySingle)
 		RETURN_FALSE;
 	}
 
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 	return_code = sqlite3_step(stmt);
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 
 	switch (return_code) {
 		case SQLITE_ROW: /* Valid Row */
@@ -1813,13 +1796,7 @@ PHP_METHOD(SQLite3Stmt, execute)
 		RETURN_FALSE;
 	}
 
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 	return_code = sqlite3_step(stmt_obj->stmt);
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 
 	switch (return_code) {
 		case SQLITE_ROW: /* Valid Row */
@@ -1976,13 +1953,7 @@ PHP_METHOD(SQLite3Result, fetchArray)
 
 	SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
 
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 	ret = sqlite3_step(result_obj->stmt_obj->stmt);
-#ifdef HAVE_VALGRIND
-	CALLGRIND_TOGGLE_COLLECT;
-#endif
 	switch (ret) {
 		case SQLITE_ROW:
 			/* If there was no return value then just skip fetching */