Fix regression

Author: nielsdos

Zend/Optimizer/dfa_pass.c

@@ -1111,7 +1111,6 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa
 		if (ssa_var->no_val && !ssa_var->alias) {
 			/* Flag will be used by VM type spec handler */
 			opline->extended_value = 1;
-			// fprintf(stderr, "optimize\n");
 		}
 	}
 }

Zend/Optimizer/sccp.c

@@ -2201,8 +2201,6 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var,
 			}
 
 			if (opline->opcode == ZEND_SEND_VAR) {
-				opline->extended_value = 0;
-				zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
 				return 0;
 			}
 
@@ -2349,7 +2347,7 @@ static int replace_constant_operands(sccp_ctx *ctx) {
 			zend_op *opline = &op_array->opcodes[use];
 			zend_ssa_op *ssa_op = &ssa->ops[use];
 			if (opline->opcode == ZEND_SEND_VAR && ssa_op->op1_use == i && ssa_op->op1_def >= 0) {
-				// zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
+				zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
 			}
 			if (try_replace_op1(ctx, opline, ssa_op, i, value)) {
 				if (opline->opcode == ZEND_NOP) {

benchmark/benchmark.php

@@ -13,12 +13,12 @@ function main() {
     global $storeResult;
 
     $data = [];
-    $data['Zend/bench.php'] = runBench(false);
+/*    $data['Zend/bench.php'] = runBench(false);
     $data['Zend/bench.php JIT'] = runBench(true);
     $data['Symfony Demo 2.2.3'] = runSymfonyDemo(false);
-    $data['Symfony Demo 2.2.3 JIT'] = runSymfonyDemo(true);
+    $data['Symfony Demo 2.2.3 JIT'] = runSymfonyDemo(true);*/
     $data['Wordpress 6.2'] = runWordpress(false);
-    $data['Wordpress 6.2 JIT'] = runWordpress(true);
+//    $data['Wordpress 6.2 JIT'] = runWordpress(true);
     $result = json_encode($data, JSON_PRETTY_PRINT) . "\n";
 
     fwrite(STDOUT, $result);
@@ -78,7 +78,7 @@ function runWordpress(bool $jit): array {
 
     // Warmup
     runPhpCommand([$dir . '/index.php'], $dir);
-    return runValgrindPhpCgiCommand([$dir . '/index.php'], cwd: $dir, jit: $jit, warmup: 50, repeat: 50);
+    return runValgrindPhpCgiCommand([$dir . '/index.php'], cwd: $dir, jit: $jit, warmup: 2, repeat: 2);
 }
 
 function runPhpCommand(array $args, ?string $cwd = null): ProcessResult {
@@ -97,11 +97,12 @@ function runValgrindPhpCgiCommand(
         'valgrind',
         '--tool=callgrind',
         '--dump-instr=yes',
-        '--callgrind-out-file=/dev/null',
+        //'--callgrind-out-file=/dev/null',
         '--',
         $phpCgi,
         '-T' . ($warmup ? $warmup . ',' : '') . $repeat,
         '-d max_execution_time=0',
+        '-c', '/run/media/niels/MoreData/php-src',
         '-d opcache.enable=1',
         '-d opcache.jit_buffer_size=' . ($jit ? '128M' : '0'),
         '-d opcache.validate_timestamps=0',