Skip to content

JIT: Discard veneers if generation failed #24765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndossche wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+14 −1
Open

JIT: Discard veneers if generation failed #24765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,15 @@ static void zend_jit_commit_veneers(void)
}
}
}

static void zend_jit_discard_veneers(void)
{
int i, count = sizeof(zend_jit_stubs) / sizeof(zend_jit_stubs[0]);

for (i = 0; i < count; i++) {
zend_jit_stub_handlers[count + i] = NULL;
}
}
#endif

static bool zend_jit_prefer_const_addr_load(zend_jit_ctx *jit, uintptr_t addr)
Expand Down Expand Up @@ -2924,7 +2933,11 @@ static void *zend_jit_ir_compile(ir_ctx *ctx, size_t *size, const char *name)

#if defined(IR_TARGET_AARCH64)
if (ctx->flags2 & IR_HAS_VENEERS) {
zend_jit_commit_veneers();
if (entry) {
zend_jit_commit_veneers();
} else {
zend_jit_discard_veneers();
}
}
#endif

Expand Down
Loading