mirrors/php-src
0
0 Fork 0
mirror of https://github.com/php/php-src.git synced 2026-10-28 17:56:50 +08:00
Code Activity

Merge branch 'PHP-8.5' into PHP-8.6

Browse Source 
* PHP-8.5:
  IR: Backport code buffer rollback fix
This commit is contained in:
ndossche committed 2026-10-26 21:11:21 +01:00
2 parents cc2b92ce9f 974487f00d
commit e356f985f1
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ext/opcache/jit/ir/ir_aarch64.dasc
+2 -2
View File
@@ -9667,7 +9667,7 @@ void *ir_emit_code(ir_ctx *ctx, size_t *size_ptr)
if (ctx->code_buffer) {
if (ctx->code_buffer->pos == (char*)entry + size) {
/* rollback */
ctx->code_buffer->pos = (char*)entry - size;
ctx->code_buffer->pos = (char*)entry;
}
} else {
ir_mem_unmap(entry, size);
@@ -9790,7 +9790,7 @@ const void *ir_emit_exitgroup(uint32_t first_exit_point, uint32_t exit_points_pe
dasm_free(&dasm_state);
if (code_buffer->pos == (char*)entry + size) {
/* rollback */
code_buffer->pos = (char*)entry - size;
code_buffer->pos = (char*)entry;
}
return NULL;
}
ext/opcache/jit/ir/ir_x86.dasc
+2 -2
View File
@@ -26954,7 +26954,7 @@ next_block:;
if (ctx->code_buffer) {
if (ctx->code_buffer->pos == (char*)entry + size) {
/* rollback */
ctx->code_buffer->pos = (char*)entry - size;
ctx->code_buffer->pos = (char*)entry;
}
} else {
ir_mem_unmap(entry, size);
@@ -27080,7 +27080,7 @@ const void *ir_emit_exitgroup(uint32_t first_exit_point, uint32_t exit_points_pe
dasm_free(&dasm_state);
if (code_buffer->pos == (char*)entry + size) {
/* rollback */
code_buffer->pos = (char*)entry - size;
code_buffer->pos = (char*)entry;
}
return NULL;
}