fixup! Improve error messages for invalid property access

kocsismate · kocsismate · commit 25794487ee36 · 2020-05-14T14:26:51.000+02:00
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -1509,7 +1509,7 @@ static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
 	zend_error(E_WARNING, "Trying to access array offset on value of type %s", zend_zval_type_name(container));
 }
 
-static void ZEND_FASTCALL zend_jit_invalid_property_read(zval *container, char *property_name)
+static void ZEND_FASTCALL zend_jit_invalid_property_read(zval *container, const char *property_name)
 {
 	zend_error(E_WARNING, "Attempt to read property '%s' on %s", property_name, zend_zval_type_name(container));
 }
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -10590,7 +10590,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, const zend_op *opline, cons
 				|	EXT_CALL zend_jit_undefined_op_helper, r0
 				|1:
 			}
-			|	GET_ZVAL_PTR FCARG1a, op1_addr
+			|	LOAD_ZVAL_ADDR FCARG1a, op1_addr
 			|	LOAD_ADDR FCARG2a, Z_STRVAL_P(member)
 			|	EXT_CALL zend_jit_invalid_property_read, r0
 		}

Original file line number	Diff line number	Diff line change
`@@ -1509,7 +1509,7 @@ static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)`
`1509`	`1509`	`zend_error(E_WARNING, "Trying to access array offset on value of type %s", zend_zval_type_name(container));`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`		`-static void ZEND_FASTCALL zend_jit_invalid_property_read(zval container, char property_name)`
	`1512`	`+static void ZEND_FASTCALL zend_jit_invalid_property_read(zval container, const char property_name)`
`1513`	`1513`	`{`
`1514`	`1514`	`zend_error(E_WARNING, "Attempt to read property '%s' on %s", property_name, zend_zval_type_name(container));`
`1515`	`1515`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10590,7 +10590,7 @@ static int zend_jit_fetch_obj_read(dasm_State *Dst, const zend_op opline, cons`
`10590`	`10590`	`\| EXT_CALL zend_jit_undefined_op_helper, r0`
`10591`	`10591`	`\|1:`
`10592`	`10592`	`}`
`10593`		`- \| GET_ZVAL_PTR FCARG1a, op1_addr`
	`10593`	`+ \| LOAD_ZVAL_ADDR FCARG1a, op1_addr`
`10594`	`10594`	`\| LOAD_ADDR FCARG2a, Z_STRVAL_P(member)`
`10595`	`10595`	`\| EXT_CALL zend_jit_invalid_property_read, r0`
`10596`	`10596`	`}`