Skip to content

Commit 3081423

Browse files
dstogovdstogov
committed
Tracing JIT: Fixed register allocation
In case of side exit on ADD/SUB/MUL overflow source registers must be kept unchanged
1 parent 3dba556 commit 3081423

File tree

2 files changed

+200
-0
lines changed

2 files changed

+200
-0
lines changed

‎ext/opcache/jit/zend_jit_x86.dasc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15776,6 +15776,8 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
1577615776
ZEND_REGSET_INCL(regset, ZREG_R0);
1577715777
ZEND_REGSET_INCL(regset, ZREG_XMM0);
1577815778
ZEND_REGSET_INCL(regset, ZREG_XMM1);
15779+
} else if (res_info & MAY_BE_GUARD) {
15780+
ZEND_REGSET_INCL(regset, ZREG_R0);
1577915781
}
1578015782
}
1578115783
if ((op1_info & MAY_BE_LONG) && (op2_info & MAY_BE_DOUBLE)) {

‎ext/opcache/tests/jit/add_011.phpt‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
--TEST--
2+
JIT ADD: 011 overflow handling
3+
--INI--
4+
opcache.enable=1
5+
opcache.enable_cli=1
6+
opcache.file_update_protection=0
7+
opcache.jit_buffer_size=1M
8+
--SKIPIF--
9+
<?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
10+
--FILE--
11+
<?php
12+
function test() {
13+
$n = $a = 0;
14+
while ($a <= 0) {
15+
$a &= $a-- + $a + $u;
16+
var_dump($a);
17+
if (++$n > 59) die("bug\n");
18+
}
19+
}
20+
test();
21+
?>
22+
--EXPECTF--
23+
Warning: Undefined variable $u in %sadd_011.php on line 5
24+
int(-1)
25+
26+
Warning: Undefined variable $u in %sadd_011.php on line 5
27+
int(-4)
28+
29+
Warning: Undefined variable $u in %sadd_011.php on line 5
30+
int(-13)
31+
32+
Warning: Undefined variable $u in %sadd_011.php on line 5
33+
int(-32)
34+
35+
Warning: Undefined variable $u in %sadd_011.php on line 5
36+
int(-97)
37+
38+
Warning: Undefined variable $u in %sadd_011.php on line 5
39+
int(-228)
40+
41+
Warning: Undefined variable $u in %sadd_011.php on line 5
42+
int(-493)
43+
44+
Warning: Undefined variable $u in %sadd_011.php on line 5
45+
int(-1024)
46+
47+
Warning: Undefined variable $u in %sadd_011.php on line 5
48+
int(-3073)
49+
50+
Warning: Undefined variable $u in %sadd_011.php on line 5
51+
int(-7172)
52+
53+
Warning: Undefined variable $u in %sadd_011.php on line 5
54+
int(-15373)
55+
56+
Warning: Undefined variable $u in %sadd_011.php on line 5
57+
int(-31776)
58+
59+
Warning: Undefined variable $u in %sadd_011.php on line 5
60+
int(-64609)
61+
62+
Warning: Undefined variable $u in %sadd_011.php on line 5
63+
int(-130276)
64+
65+
Warning: Undefined variable $u in %sadd_011.php on line 5
66+
int(-261613)
67+
68+
Warning: Undefined variable $u in %sadd_011.php on line 5
69+
int(-524288)
70+
71+
Warning: Undefined variable $u in %sadd_011.php on line 5
72+
int(-1572865)
73+
74+
Warning: Undefined variable $u in %sadd_011.php on line 5
75+
int(-3670020)
76+
77+
Warning: Undefined variable $u in %sadd_011.php on line 5
78+
int(-7864333)
79+
80+
Warning: Undefined variable $u in %sadd_011.php on line 5
81+
int(-16252960)
82+
83+
Warning: Undefined variable $u in %sadd_011.php on line 5
84+
int(-33030241)
85+
86+
Warning: Undefined variable $u in %sadd_011.php on line 5
87+
int(-66584804)
88+
89+
Warning: Undefined variable $u in %sadd_011.php on line 5
90+
int(-133693933)
91+
92+
Warning: Undefined variable $u in %sadd_011.php on line 5
93+
int(-267912192)
94+
95+
Warning: Undefined variable $u in %sadd_011.php on line 5
96+
int(-536349697)
97+
98+
Warning: Undefined variable $u in %sadd_011.php on line 5
99+
int(-1073224708)
100+
101+
Warning: Undefined variable $u in %sadd_011.php on line 5
102+
int(-2146974733)
103+
104+
Warning: Undefined variable $u in %sadd_011.php on line 5
105+
int(-4294474784)
106+
107+
Warning: Undefined variable $u in %sadd_011.php on line 5
108+
int(-8589474913)
109+
110+
Warning: Undefined variable $u in %sadd_011.php on line 5
111+
int(-17179475172)
112+
113+
Warning: Undefined variable $u in %sadd_011.php on line 5
114+
int(-34359475693)
115+
116+
Warning: Undefined variable $u in %sadd_011.php on line 5
117+
int(-68719476736)
118+
119+
Warning: Undefined variable $u in %sadd_011.php on line 5
120+
int(-206158430209)
121+
122+
Warning: Undefined variable $u in %sadd_011.php on line 5
123+
int(-481036337156)
124+
125+
Warning: Undefined variable $u in %sadd_011.php on line 5
126+
int(-1030792151053)
127+
128+
Warning: Undefined variable $u in %sadd_011.php on line 5
129+
int(-2130303778848)
130+
131+
Warning: Undefined variable $u in %sadd_011.php on line 5
132+
int(-4329327034465)
133+
134+
Warning: Undefined variable $u in %sadd_011.php on line 5
135+
int(-8727373545700)
136+
137+
Warning: Undefined variable $u in %sadd_011.php on line 5
138+
int(-17523466568173)
139+
140+
Warning: Undefined variable $u in %sadd_011.php on line 5
141+
int(-35115652613120)
142+
143+
Warning: Undefined variable $u in %sadd_011.php on line 5
144+
int(-70300024704001)
145+
146+
Warning: Undefined variable $u in %sadd_011.php on line 5
147+
int(-140668768885764)
148+
149+
Warning: Undefined variable $u in %sadd_011.php on line 5
150+
int(-281406257249293)
151+
152+
Warning: Undefined variable $u in %sadd_011.php on line 5
153+
int(-562881233976352)
154+
155+
Warning: Undefined variable $u in %sadd_011.php on line 5
156+
int(-1125831187430497)
157+
158+
Warning: Undefined variable $u in %sadd_011.php on line 5
159+
int(-2251731094338788)
160+
161+
Warning: Undefined variable $u in %sadd_011.php on line 5
162+
int(-4503530908155373)
163+
164+
Warning: Undefined variable $u in %sadd_011.php on line 5
165+
int(-9007130535788544)
166+
167+
Warning: Undefined variable $u in %sadd_011.php on line 5
168+
int(-18014329791578113)
169+
170+
Warning: Undefined variable $u in %sadd_011.php on line 5
171+
int(-36028728303157252)
172+
173+
Warning: Undefined variable $u in %sadd_011.php on line 5
174+
int(-72057525326315533)
175+
176+
Warning: Undefined variable $u in %sadd_011.php on line 5
177+
int(-144115119372632096)
178+
179+
Warning: Undefined variable $u in %sadd_011.php on line 5
180+
int(-288230307465265249)
181+
182+
Warning: Undefined variable $u in %sadd_011.php on line 5
183+
int(-576460683650531556)
184+
185+
Warning: Undefined variable $u in %sadd_011.php on line 5
186+
int(-1152921436021064173)
187+
188+
Warning: Undefined variable $u in %sadd_011.php on line 5
189+
int(-2305842940762129408)
190+
191+
Warning: Undefined variable $u in %sadd_011.php on line 5
192+
int(-4611685950244260865)
193+
194+
Warning: Undefined variable $u in %sadd_011.php on line 5
195+
int(-9223371969208523780)
196+
197+
Warning: Undefined variable $u in %sadd_011.php on line 5
198+
int(66572500992)

0 commit comments

Comments
 (0)