Commit 41e11a6
committed
Fix GH-18567: Preloading with internal class alias triggers assertion failure
The assertion is imprecise now, and the code assumed that from the
moment an internal class was encountered that there were only internal
classes remaining. This is wrong now, and we still have to continue if
we encounter an internal class. We can only skip the remaining iterations
if the entry in the hash table is not an alias.
Closes GH-18575.1 parent 92a0cc7 commit 41e11a6
File tree
4 files changed
+61
-5
lines changed- ext/opcache
- tests
4 files changed
+61
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
| 36 | + | |
35 | 37 | | |
36 | 38 | | |
37 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3522 | 3522 | | |
3523 | 3523 | | |
3524 | 3524 | | |
3525 | | - | |
| 3525 | + | |
3526 | 3526 | | |
3527 | 3527 | | |
3528 | 3528 | | |
| |||
3610 | 3610 | | |
3611 | 3611 | | |
3612 | 3612 | | |
3613 | | - | |
| 3613 | + | |
| 3614 | + | |
| 3615 | + | |
| 3616 | + | |
| 3617 | + | |
| 3618 | + | |
| 3619 | + | |
| 3620 | + | |
| 3621 | + | |
3614 | 3622 | | |
3615 | 3623 | | |
3616 | 3624 | | |
| |||
3904 | 3912 | | |
3905 | 3913 | | |
3906 | 3914 | | |
3907 | | - | |
| 3915 | + | |
| 3916 | + | |
| 3917 | + | |
| 3918 | + | |
| 3919 | + | |
| 3920 | + | |
3908 | 3921 | | |
3909 | 3922 | | |
3910 | 3923 | | |
| |||
3990 | 4003 | | |
3991 | 4004 | | |
3992 | 4005 | | |
| 4006 | + | |
| 4007 | + | |
3993 | 4008 | | |
3994 | | - | |
| 4009 | + | |
| 4010 | + | |
| 4011 | + | |
| 4012 | + | |
3995 | 4013 | | |
| 4014 | + | |
3996 | 4015 | | |
3997 | 4016 | | |
3998 | 4017 | | |
| |||
4009 | 4028 | | |
4010 | 4029 | | |
4011 | 4030 | | |
4012 | | - | |
| 4031 | + | |
| 4032 | + | |
| 4033 | + | |
| 4034 | + | |
| 4035 | + | |
| 4036 | + | |
| 4037 | + | |
4013 | 4038 | | |
4014 | 4039 | | |
4015 | 4040 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
0 commit comments