Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .phpstorm.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
'zend_object_iterator' => \ZEngine\Generated\zend_object_iterator::class,
'zend_object_iterator_funcs' => \ZEngine\Generated\zend_object_iterator_funcs::class,
'zend_objects_store' => \ZEngine\Generated\zend_objects_store::class,
'zend_oom_info' => \ZEngine\Generated\zend_oom_info::class,
'zend_op' => \ZEngine\Generated\zend_op::class,
'zend_op_array' => \ZEngine\Generated\zend_op_array::class,
'zend_oparray_context' => \ZEngine\Generated\zend_oparray_context::class,
Expand Down Expand Up @@ -154,6 +155,7 @@
'zend_object_iterator' => \ZEngine\Generated\zend_object_iterator::class,
'zend_object_iterator_funcs' => \ZEngine\Generated\zend_object_iterator_funcs::class,
'zend_objects_store' => \ZEngine\Generated\zend_objects_store::class,
'zend_oom_info' => \ZEngine\Generated\zend_oom_info::class,
'zend_op' => \ZEngine\Generated\zend_op::class,
'zend_op_array' => \ZEngine\Generated\zend_op_array::class,
'zend_oparray_context' => \ZEngine\Generated\zend_oparray_context::class,
Expand Down Expand Up @@ -293,6 +295,8 @@
'zend_object_iterator_funcs *' => \ZEngine\Generated\zend_object_iterator_funcs::class,
'zend_objects_store' => \ZEngine\Generated\zend_objects_store::class,
'zend_objects_store *' => \ZEngine\Generated\zend_objects_store::class,
'zend_oom_info' => \ZEngine\Generated\zend_oom_info::class,
'zend_oom_info *' => \ZEngine\Generated\zend_oom_info::class,
'zend_op' => \ZEngine\Generated\zend_op::class,
'zend_op *' => \ZEngine\Generated\zend_op::class,
'zend_op_array' => \ZEngine\Generated\zend_op_array::class,
Expand Down
6 changes: 3 additions & 3 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ offsets; the opcache file-cache relocator runs on ZTS since issue #118.
The 8.4 artifacts are maintained on the `8.4` branch;
`include/8.5/darwin-*` is maintained here - after changing the generator,
refresh it with one `workflow_dispatch` run of the workflow on `master`.
A leg whose thread-safety mode setup-php cannot provide (currently ZTS
PHP 8.5 on Intel) skips cleanly and self-heals on a later run; the CI
presence guards keep the gap visible as warnings.
A leg whose thread-safety mode setup-php cannot provide skips cleanly and
self-heals on a later run; the CI presence guards keep the gap visible as
warnings.

### Windows artifacts

Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ Engine memory layouts change between every PHP minor version, so each PHP minor

| PHP | OS / Arch / TS | Branch | Status |
|-----|----------------|--------|--------|
| 8.5 | linux-x64 (nts, zts), darwin-x64 (nts), darwin-arm64 (nts, zts), windows-x64 (nts, zts) | `master` | ✅ supported¹ |
| 8.5 | linux-x64 (nts, zts), darwin-x64 (nts, zts), darwin-arm64 (nts, zts), windows-x64 (nts, zts) | `master` | ✅ supported |
| 8.4 | linux-x64 (nts, zts), darwin-x64 (nts, zts), darwin-arm64 (nts, zts), windows-x64 (nts, zts) | `8.4` | ✅ supported |
| 8.0 | linux-x64-nts | `8.0` | 🧊 frozen (legacy) |

¹ `darwin-x64-zts` on 8.5 lands as soon as a ZTS PHP 8.5 build exists for Intel macOS runners — the generation workflow picks it up automatically.

> **Version matching is not optional.** Running Z-Engine against a PHP minor it was not built for corrupts memory. `Core::init()` enforces the match and aborts with a clear message rather than letting you crash.

## Memory safety & long-running PHP
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-arm64-nts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -728,6 +740,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -830,6 +843,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-arm64-nts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-arm64-nts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-arm64-zts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -729,6 +741,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -832,6 +845,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-arm64-zts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-arm64-zts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-x64-nts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -728,6 +740,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -830,6 +843,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-x64-nts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-x64-nts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-x64-zts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -729,6 +741,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -832,6 +845,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-x64-zts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-x64-zts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/linux-x64-nts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -732,6 +744,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -834,6 +847,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
Loading
Loading