Skip to content

Commit 33b4bdc

Browse files
dstogovdstogov
authored
JIT for INIT_STATIC_METHOD_CALL (#16206)
* JIT for INIT_STATIC_METHOD_CALL * Fixed typo * Fix missing LOAD * Separate zend_get_known_class()
1 parent b34f22d commit 33b4bdc

File tree

6 files changed

+341
-39
lines changed

6 files changed

+341
-39
lines changed

‎Zend/zend_execute.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2454,7 +2454,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_invalid_method_call(z
24542454
Z_STRVAL_P(function_name), zend_zval_value_name(object));
24552455
}
24562456

2457-
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_non_static_method_call(const zend_function *fbc)
2457+
ZEND_API void ZEND_FASTCALL zend_non_static_method_call(const zend_function *fbc)
24582458
{
24592459
zend_throw_error(
24602460
zend_ce_error,

‎Zend/zend_execute.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ ZEND_API void zend_cleanup_unfinished_execution(zend_execute_data *execute_data,
436436
ZEND_API ZEND_ATTRIBUTE_DEPRECATED HashTable *zend_unfinished_execution_gc(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer);
437437
ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield);
438438
ZEND_API zval* ZEND_FASTCALL zend_fetch_static_property(zend_execute_data *ex, int fetch_type);
439+
ZEND_API void ZEND_FASTCALL zend_non_static_method_call(const zend_function *fbc);
439440

440441
ZEND_API void zend_frameless_observed_call(zend_execute_data *execute_data);
441442

‎ext/opcache/jit/zend_jit.c‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,43 @@ static bool zend_jit_is_persistent_constant(zval *key, uint32_t flags)
558558
return c && (ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT);
559559
}
560560

561+
static zend_class_entry* zend_get_known_class(const zend_op_array *op_array, const zend_op *opline, uint8_t op_type, znode_op op)
562+
{
563+
zend_class_entry *ce = NULL;
564+
565+
if (op_type == IS_CONST) {
566+
zval *zv = RT_CONSTANT(opline, op);
567+
zend_string *class_name;
568+
569+
ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING);
570+
class_name = Z_STR_P(zv);
571+
ce = zend_lookup_class_ex(class_name, NULL, ZEND_FETCH_CLASS_NO_AUTOLOAD);
572+
if (ce && (ce->type == ZEND_INTERNAL_CLASS || ce->info.user.filename != op_array->filename)) {
573+
ce = NULL;
574+
}
575+
} else {
576+
ZEND_ASSERT(op_type == IS_UNUSED);
577+
if ((op.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
578+
ce = op_array->scope;
579+
} else {
580+
ZEND_ASSERT((op.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT);
581+
ce = op_array->scope;
582+
if (ce) {
583+
if (ce->parent) {
584+
ce = ce->parent;
585+
if (ce->type == ZEND_INTERNAL_CLASS || ce->info.user.filename != op_array->filename) {
586+
ce = NULL;
587+
}
588+
} else {
589+
ce = NULL;
590+
}
591+
}
592+
}
593+
}
594+
595+
return ce;
596+
}
597+
561598
static zend_property_info* zend_get_known_property_info(const zend_op_array *op_array, zend_class_entry *ce, zend_string *member, bool on_this, zend_string *filename)
562599
{
563600
zend_property_info *info = NULL;
@@ -2520,6 +2557,19 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
25202557
goto jit_failure;
25212558
}
25222559
goto done;
2560+
case ZEND_INIT_STATIC_METHOD_CALL:
2561+
if (!(opline->op2_type == IS_CONST
2562+
&& (opline->op1_type == IS_CONST
2563+
|| (opline->op1_type == IS_UNUSED
2564+
&& ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF
2565+
|| (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT))))) {
2566+
break;
2567+
}
2568+
if (!zend_jit_init_static_method_call(&ctx, opline, b, op_array, ssa, ssa_op, call_level,
2569+
NULL, 0)) {
2570+
goto jit_failure;
2571+
}
2572+
goto done;
25232573
case ZEND_ROPE_INIT:
25242574
case ZEND_ROPE_ADD:
25252575
case ZEND_ROPE_END:

‎ext/opcache/jit/zend_jit_helpers.c‎

Lines changed: 88 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,100 @@ static zend_function* ZEND_FASTCALL zend_jit_find_method_tmp_helper(zend_object
189189
return fbc;
190190
}
191191

192-
static zend_execute_data* ZEND_FASTCALL zend_jit_push_static_metod_call_frame(zend_object *obj, zend_function *fbc, uint32_t num_args)
192+
193+
static zend_class_entry* ZEND_FASTCALL zend_jit_find_class_helper(zend_execute_data *execute_data)
194+
{
195+
const zend_op *opline = EX(opline);
196+
zend_class_entry *ce;
197+
198+
if (opline->op1_type == IS_CONST) {
199+
/* no function found. try a static method in class */
200+
ce = CACHED_PTR(opline->result.num);
201+
if (UNEXPECTED(ce == NULL)) {
202+
ce = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op1)), Z_STR_P(RT_CONSTANT(opline, opline->op1) + 1), ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
203+
}
204+
} else if (opline->op1_type == IS_UNUSED) {
205+
ce = zend_fetch_class(NULL, opline->op1.num);
206+
} else {
207+
ce = Z_CE_P(EX_VAR(opline->op1.var));
208+
}
209+
return ce;
210+
}
211+
212+
static zend_function* ZEND_FASTCALL zend_jit_find_static_method_helper(zend_execute_data *execute_data, zend_class_entry *ce)
213+
{
214+
const zend_op *opline = EX(opline);
215+
zend_function *fbc;
216+
217+
ZEND_ASSERT(opline->op2_type == IS_CONST);
218+
219+
if (opline->op1_type == IS_CONST &&
220+
EXPECTED((fbc = CACHED_PTR(opline->result.num + sizeof(void*))) != NULL)) {
221+
/* nothing to do */
222+
} else if (opline->op1_type != IS_CONST &&
223+
EXPECTED(CACHED_PTR(opline->result.num) == ce)) {
224+
fbc = CACHED_PTR(opline->result.num + sizeof(void*));
225+
} else if (opline->op2_type != IS_UNUSED) {
226+
zval *function_name = RT_CONSTANT(opline, opline->op2);
227+
228+
ZEND_ASSERT(Z_TYPE_P(function_name) == IS_STRING);
229+
if (ce->get_static_method) {
230+
fbc = ce->get_static_method(ce, Z_STR_P(function_name));
231+
} else {
232+
fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), RT_CONSTANT(opline, opline->op2) + 1);
233+
}
234+
if (UNEXPECTED(fbc == NULL)) {
235+
if (EXPECTED(!EG(exception))) {
236+
zend_undefined_method(ce, Z_STR_P(function_name));
237+
}
238+
return NULL;
239+
}
240+
if (EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE))) &&
241+
EXPECTED(!(fbc->common.scope->ce_flags & ZEND_ACC_TRAIT))) {
242+
CACHE_POLYMORPHIC_PTR(opline->result.num, ce, fbc);
243+
}
244+
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
245+
zend_init_func_run_time_cache(&fbc->op_array);
246+
}
247+
} else {
248+
if (UNEXPECTED(ce->constructor == NULL)) {
249+
zend_throw_error(NULL, "Cannot call constructor");
250+
return NULL;
251+
}
252+
if (Z_TYPE(EX(This)) == IS_OBJECT && Z_OBJ(EX(This))->ce != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
253+
zend_throw_error(NULL, "Cannot call private %s::__construct()", ZSTR_VAL(ce->name));
254+
return NULL;;
255+
}
256+
fbc = ce->constructor;
257+
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
258+
zend_init_func_run_time_cache(&fbc->op_array);
259+
}
260+
}
261+
262+
return fbc;
263+
}
264+
265+
static zend_execute_data* ZEND_FASTCALL zend_jit_push_this_method_call_frame(zend_class_entry *scope, zend_function *fbc, uint32_t num_args)
266+
{
267+
zend_execute_data *execute_data = EG(current_execute_data);
268+
269+
if (Z_TYPE(EX(This)) != IS_OBJECT || !instanceof_function(Z_OBJCE(EX(This)), scope)) {
270+
zend_non_static_method_call(fbc);
271+
return NULL;
272+
}
273+
274+
scope = (zend_class_entry*)Z_OBJ(EX(This));
275+
return zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_HAS_THIS, fbc, num_args, scope);
276+
}
277+
278+
static zend_execute_data* ZEND_FASTCALL zend_jit_push_static_method_call_frame(zend_object *obj, zend_function *fbc, uint32_t num_args)
193279
{
194280
zend_class_entry *scope = obj->ce;
195281

196282
return zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, num_args, scope);
197283
}
198284

199-
static zend_execute_data* ZEND_FASTCALL zend_jit_push_static_metod_call_frame_tmp(zend_object *obj, zend_function *fbc, uint32_t num_args)
285+
static zend_execute_data* ZEND_FASTCALL zend_jit_push_static_method_call_frame_tmp(zend_object *obj, zend_function *fbc, uint32_t num_args)
200286
{
201287
zend_class_entry *scope = obj->ce;
202288

0 commit comments

Comments
 (0)