Fix GH-10271: Incorrect arithmetic calculations when using JIT

Author: dstogov

ext/opcache/jit/zend_jit_x86.dasc

@@ -16209,11 +16209,17 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
 					}
 				}
 				if ((op1_info & MAY_BE_LONG) && (op2_info & MAY_BE_DOUBLE)) {
+					if (opline->op1_type == IS_CONST) {
+						ZEND_REGSET_INCL(regset, ZREG_R0);
+					}
 					if (ssa_op->result_def != current_var) {
 						ZEND_REGSET_INCL(regset, ZREG_XMM0);
 					}
 				}
 				if ((op1_info & MAY_BE_DOUBLE) && (op2_info & MAY_BE_LONG)) {
+					if (opline->op2_type == IS_CONST) {
+						ZEND_REGSET_INCL(regset, ZREG_R0);
+					}
 					if (zend_is_commutative(opline->opcode)) {
 						if (ssa_op->result_def != current_var) {
 							ZEND_REGSET_INCL(regset, ZREG_XMM0);

ext/opcache/tests/jit/gh10271.phpt

@@ -0,0 +1,47 @@
+--TEST--
+GH-10271: Incorrect arithmetic calculations when using JIT
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+opcache.jit_hot_loop=1
+--FILE--
+<?php
+$tang['KSI']=-9.1751656444142E-5;
+$tang['ETA']=8.5076090069491E-5;
+
+$sol['X']['k']=-222.45470924306;
+$sol['X']['e']=-8.1787760034414;
+$sol['X'][1]=-0.020231298698539;
+
+$sol['Y']['k']=-14.400586941152;
+$sol['Y']['e']=392.95090925357;
+$sol['Y'][1]=-0.035664413413272;
+
+$sol['xc']=968;
+$sol['yc']=548;
+
+for( $p=0; $p<3; $p++ )
+{
+	print($p.': ');
+	Tangential2XY($tang,$sol);
+}
+
+function Tangential2XY(array $tang, array $sol) : array
+{
+	$x = $sol['X']['k']*$tang['KSI'] + $sol['X']['e']*$tang['ETA'] + $sol['X'][1];
+	$y = $sol['Y']['k']*$tang['KSI'] + $sol['Y']['e']*$tang['ETA'] + $sol['Y'][1];
+	printf("In;%.12f;%.12f;%.12f;%.12f;",$x,$y,$sol['xc'],$sol['yc']);
+	$x = $sol['xc']*($x+1);
+	$y = $sol['yc']*($y+1);
+	printf("Out;%.12f;%.12f\n",$x,$y);
+	if( $x<100 )
+		exit("Mamy to!\n");
+	return ['x'=>$x,'y'=>$y];
+}
+?>
+--EXPECT--
+0: In;-0.000516528926;-0.000912408759;968.000000000000;548.000000000000;Out;967.500000000004;547.500000000009
+1: In;-0.000516528926;-0.000912408759;968.000000000000;548.000000000000;Out;967.500000000004;547.500000000009
+2: In;-0.000516528926;-0.000912408759;968.000000000000;548.000000000000;Out;967.500000000004;547.500000000009