always flush

krakjoe · Feb 11, 2019 · a41f9db · a41f9db
1 parent 5d80d5e
commit a41f9db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/php_inspector.c b/php_inspector.c
@@ -258,6 +258,7 @@ static void php_inspector_execute(zend_execute_data *execute_data) {
 
 	if (UNEXPECTED(map)) {
 		if (UNEXPECTED(!function->function_name)) {
+
 			php_inspector_table_apply_specific(
 				PHP_INSPECTOR_ROOT_PENDING,
 				PHP_INSPECTOR_TABLE_FILE,

diff --git a/src/file.c b/src/file.c
@@ -163,10 +163,12 @@ int php_inspector_file_resolve(zval *zv, zend_function *ops) {
 
 	if (function->function) {
 		php_inspector_breaks_purge(function->function);
-		php_inspector_instruction_cache_flush(zv, NULL);
 	}
 
 	function->function = ops;
+	function->expired = 0;
+
+	php_inspector_instruction_cache_flush(zv, NULL);
 
 	if (ZEND_USER_CODE(onResolve->type)) {
 		zval rv;
@@ -186,7 +188,6 @@ int php_inspector_file_resolve(zval *zv, zend_function *ops) {
 	}
 
 	function->expired = 1;
-	function->function = NULL;
 
 	return ZEND_HASH_APPLY_REMOVE;
 }

diff --git a/src/function.c b/src/function.c
@@ -298,9 +298,10 @@ int php_inspector_function_resolve(zval *zv, zend_function *ops) {
 
 	if (function->function) {
 		php_inspector_breaks_purge(function->function);
-		php_inspector_instruction_cache_flush(zv, NULL);
 	}
 
+	php_inspector_instruction_cache_flush(zv, NULL);
+
 	function->function = (zend_function*) php_inspector_map_create((zend_op_array*) ops);
 
 	if (ZEND_USER_CODE(onResolve->type)) {