JIT to write to FFI variables

Author: dstogov

ext/opcache/jit/zend_jit_ir.c

@@ -15054,6 +15054,40 @@ static int zend_jit_ffi_assign_obj(zend_jit_ctx        *jit,
 
 	return 1;
 }
+
+static int zend_jit_ffi_assign_sym(zend_jit_ctx        *jit,
+                                   const zend_op       *opline,
+                                   const zend_op_array *op_array,
+                                   zend_ssa            *ssa,
+                                   const zend_ssa_op   *ssa_op,
+                                   uint32_t             op1_info,
+                                   zend_jit_addr        op1_addr,
+                                   bool                 on_this,
+                                   bool                 delayed_fetch_this,
+                                   zend_ffi_symbol     *sym,
+                                   uint32_t             val_info,
+                                   zend_jit_addr        val_addr,
+                                   zend_jit_addr        val_def_addr,
+                                   zend_jit_addr        res_addr,
+                                   HashTable           *op1_ffi_symbols,
+                                   zend_ffi_type       *val_ffi_type,
+                                   zend_jit_ffi_info   *ffi_info)
+{
+	zend_ffi_type *sym_type = ZEND_FFI_TYPE(sym->type);
+
+	if (!zend_jit_ffi_symbols_guard(jit, opline, ssa, ssa_op->op1_use, ssa_op->op1_def, op1_addr, op1_ffi_symbols, ffi_info)) {
+		return 0;
+	}
+
+	ir_ref ptr = ir_CONST_ADDR(sym->addr);
+	if (!zend_jit_ffi_write(jit, sym_type, ptr, val_info, val_addr, val_ffi_type)) {
+		return 0;
+	}
+
+	ZEND_ASSERT(!res_addr);
+
+	return 1;
+}
 #endif
 
 static int zend_jit_assign_obj(zend_jit_ctx         *jit,
@@ -15442,6 +15476,36 @@ static int zend_jit_ffi_assign_obj_op(zend_jit_ctx        *jit,
 
 	return 1;
 }
+
+static int zend_jit_ffi_assign_sym_op(zend_jit_ctx        *jit,
+                                      const zend_op       *opline,
+                                      const zend_op_array *op_array,
+                                      zend_ssa            *ssa,
+                                      const zend_ssa_op   *ssa_op,
+                                      uint32_t             op1_info,
+                                      zend_jit_addr        op1_addr,
+                                      bool                 on_this,
+                                      bool                 delayed_fetch_this,
+                                      zend_ffi_symbol     *sym,
+                                      uint32_t             val_info,
+                                      zend_jit_addr        val_addr,
+                                      HashTable           *op1_ffi_symbols,
+                                      zend_jit_ffi_info   *ffi_info)
+{
+	zend_ffi_type *sym_type = ZEND_FFI_TYPE(sym->type);
+
+	if (!zend_jit_ffi_symbols_guard(jit, opline, ssa, ssa_op->op1_use, ssa_op->op1_def, op1_addr, op1_ffi_symbols, ffi_info)) {
+		return 0;
+	}
+
+	ir_ref ptr = ir_CONST_ADDR(sym->addr);
+	if (!zend_jit_ffi_assign_op_helper(jit, opline, opline->extended_value,
+			sym_type, ptr, val_info, val_addr)) {
+		return 0;
+	}
+
+	return 1;
+}
 #endif
 
 static int zend_jit_assign_obj_op(zend_jit_ctx         *jit,

ext/opcache/jit/zend_jit_trace.c

@@ -4926,6 +4926,23 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 								}
 								goto done;
 							}
+						} else if (op1_ffi_symbols) {
+							zend_ffi_symbol *sym = zend_hash_find_ptr(op1_ffi_symbols,
+								Z_STR_P(RT_CONSTANT(opline, opline->op2)));
+							if (sym
+							 && sym->kind == ZEND_FFI_SYM_VAR
+							 && zend_jit_ffi_compatible(sym->type, op1_data_info, op3_ffi_type)) {
+								if (!ffi_info) {
+									ffi_info = zend_arena_calloc(&CG(arena), ssa->vars_count, sizeof(zend_jit_ffi_info));
+								}
+								if (!zend_jit_ffi_assign_sym_op(&ctx, opline, op_array, ssa, ssa_op,
+										op1_info, op1_addr, on_this, delayed_fetch_this, sym,
+										op1_data_info, OP1_DATA_REG_ADDR(),
+										op1_ffi_symbols, ffi_info)) {
+									goto jit_failure;
+								}
+								goto done;
+							}
 						}
 #endif
 						if (!zend_jit_assign_obj_op(&ctx, opline, op_array, ssa, ssa_op,
@@ -5037,6 +5054,29 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 								}
 								goto done;
 							}
+						} else if (op1_ffi_symbols) {
+							zend_ffi_symbol *sym = zend_hash_find_ptr(op1_ffi_symbols,
+								Z_STR_P(RT_CONSTANT(opline, opline->op2)));
+							if (sym
+							 && sym->kind == ZEND_FFI_SYM_VAR
+							 && zend_jit_ffi_compatible(sym->type, op1_data_info, op3_ffi_type)) {
+								if (!ffi_info) {
+									ffi_info = zend_arena_calloc(&CG(arena), ssa->vars_count, sizeof(zend_jit_ffi_info));
+								}
+								if (!zend_jit_ffi_assign_sym(&ctx, opline, op_array, ssa, ssa_op,
+										op1_info, op1_addr, on_this, delayed_fetch_this, sym,
+										op1_data_info, OP1_DATA_REG_ADDR(), OP1_DATA_DEF_REG_ADDR(),
+										(opline->result_type != IS_UNUSED) ? RES_REG_ADDR() : 0,
+										op1_ffi_symbols, op3_ffi_type, ffi_info)) {
+									goto jit_failure;
+								}
+								if ((opline+1)->op1_type == IS_CV
+								 && (ssa_op+1)->op1_def >= 0
+								 && ssa->vars[(ssa_op+1)->op1_def].alias == NO_ALIAS) {
+									ssa->var_info[(ssa_op+1)->op1_def].guarded_reference = ssa->var_info[(ssa_op+1)->op1_use].guarded_reference;
+								}
+								goto done;
+							}
 						}
 #endif
 						if (!zend_jit_assign_obj(&ctx, opline, op_array, ssa, ssa_op,