x86 JIT support

Author: nikic

Zend/zend_execute.c

@@ -823,7 +823,7 @@ ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_i
 	zend_string_release(type_str);
 }
 
-ZEND_COLD zend_never_inline void zend_readonly_property_modification_error(
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_modification_error(
 		zend_property_info *info) {
 	zend_throw_error(NULL, "Cannot modify readonly property %s::$%s",
 		ZSTR_VAL(info->ce->name), zend_get_unmangled_property_name(info->name));

Zend/zend_execute.h

@@ -69,7 +69,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1
 ZEND_API ZEND_COLD zval* ZEND_FASTCALL zend_undefined_offset_write(HashTable *ht, zend_long lval);
 ZEND_API ZEND_COLD zval* ZEND_FASTCALL zend_undefined_index_write(HashTable *ht, zend_string *offset);
 
-ZEND_COLD zend_never_inline void zend_readonly_property_modification_error(zend_property_info *info);
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_modification_error(zend_property_info *info);
 
 ZEND_API bool zend_verify_scalar_type_hint(uint32_t type_mask, zval *arg, bool strict, bool is_internal_arg);
 ZEND_API ZEND_COLD void zend_verify_arg_error(

ext/opcache/jit/zend_jit_helpers.c

@@ -2006,6 +2006,14 @@ static void ZEND_FASTCALL zend_jit_assign_to_typed_prop(zval *property_val, zend
 	zend_execute_data *execute_data = EG(current_execute_data);
 	zval tmp;
 
+	if (UNEXPECTED(info->flags & ZEND_ACC_READONLY)) {
+		zend_readonly_property_modification_error(info);
+		if (result) {
+			ZVAL_UNDEF(result);
+		}
+		return;
+	}
+
 	ZVAL_DEREF(value);
 	ZVAL_COPY(&tmp, value);
 

ext/opcache/jit/zend_jit_x86.dasc

@@ -12511,7 +12511,6 @@ static int zend_jit_fetch_obj(dasm_State          **Dst,
 		|	add FCARG1a, r0
 		prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1a, 0);
 		if (opline->opcode == ZEND_FETCH_OBJ_W
-		 && (opline->extended_value & ZEND_FETCH_OBJ_FLAGS)
 		 && (!ce ||	ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS))) {
 			uint32_t flags = opline->extended_value & ZEND_FETCH_OBJ_FLAGS;
 
@@ -12521,6 +12520,13 @@ static int zend_jit_fetch_obj(dasm_State          **Dst,
 			|	jnz >1
 			|.cold_code
 			|1:
+			|	test dword [FCARG2a + offsetof(zend_property_info, flags)], ZEND_ACC_READONLY
+			|	jz >2
+			|	IF_Z_TYPE FCARG1a, IS_OBJECT, >2
+			|	mov FCARG1a, FCARG2a
+			|	EXT_CALL zend_readonly_property_modification_error, r0
+			|	jmp >9
+			|2:
 			if (flags == ZEND_FETCH_DIM_WRITE) {
 				|	SET_EX_OPLINE opline, r0
 				|	EXT_CALL zend_jit_check_array_promotion, r0
@@ -12538,7 +12544,7 @@ static int zend_jit_fetch_obj(dasm_State          **Dst,
 				|.endif
 				|	jmp >9
 			} else {
-				ZEND_UNREACHABLE();
+				ZEND_ASSERT(flags == 0);
 			}
 			|.code
 		}
@@ -12559,6 +12565,15 @@ static int zend_jit_fetch_obj(dasm_State          **Dst,
 		} else {
 			|	IF_UNDEF dl, >5
 		}
+		if (opline->opcode == ZEND_FETCH_OBJ_W && (prop_info->flags & ZEND_ACC_READONLY)) {
+			|	IF_NOT_TYPE dl, IS_OBJECT, >4
+			|.cold_code
+			|4:
+			|	LOAD_ADDR FCARG1a, prop_info
+			|	EXT_CALL zend_readonly_property_modification_error, r0
+			|	jmp >9
+			|.code
+		}
 		if (opline->opcode == ZEND_FETCH_OBJ_W
 		 && (opline->extended_value & ZEND_FETCH_OBJ_FLAGS)
 		 && ZEND_TYPE_IS_SET(prop_info->type)) {
@@ -13677,7 +13692,7 @@ static int zend_jit_assign_obj(dasm_State          **Dst,
 		}
 	} else {
 		prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1a, prop_info->offset);
-		if (!ce || ce_is_instanceof || !(ce->ce_flags & ZEND_ACC_IMMUTABLE) || ce->__get || ce->__set) {
+		if (!ce || ce_is_instanceof || !(ce->ce_flags & ZEND_ACC_IMMUTABLE) || ce->__get || ce->__set || (prop_info->flags & ZEND_ACC_READONLY)) {
 			// Undefined property with magic __get()/__set()
 			if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 				int32_t exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);