Zend: Fix JIT and consistent error message for using object as array

Author: Girgias

Zend/tests/offsets/objects/const_dimension/object_offset_behaviour.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Object offset behaviour
---XFAIL--
-Attempt to assign property of non-object warning on read before write is emitted with const offset
 --FILE--
 <?php
 

Zend/tests/offsets/objects/expect.txt

@@ -5,7 +5,7 @@ Cannot use object of type stdClass as array
 Read:
 Cannot use object of type stdClass as array
 Read-Write:
-Cannot use object as array
+Cannot use object of type stdClass as array
 isset():
 Cannot use object of type stdClass as array
 empty():

Zend/zend_execute.c

@@ -1504,9 +1504,9 @@ ZEND_API bool zend_never_inline zend_verify_class_constant_type(zend_class_const
 	return 1;
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_object_as_array(void)
+static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_object_as_array(const zend_object *object)
 {
-	zend_throw_error(NULL, "Cannot use object as array");
+	zend_throw_error(NULL, "Cannot use object of type %s as array", ZSTR_VAL(object->ce->name));
 }
 
 static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_array_offset_access(const zval *offset)
@@ -1584,7 +1584,7 @@ static zend_never_inline void zend_binary_assign_op_obj_dim(zend_object *obj, zv
 		}
 		zval_ptr_dtor(&res);
 	} else {
-		zend_use_object_as_array();
+		zend_use_object_as_array(obj);
 		if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 			ZVAL_NULL(EX_VAR(opline->result.var));
 		}

ext/opcache/jit/zend_jit_helpers.c

@@ -1582,7 +1582,9 @@ static void ZEND_FASTCALL zend_jit_assign_dim_op_helper(zval *container, zval *d
 			}
 			zval_ptr_dtor(&res);
 		} else {
-			zend_error(E_WARNING, "Attempt to assign property of non-object");
+			/* Exception is thrown in this case */
+			GC_DELREF(obj);
+			return;
 		}
 		if (UNEXPECTED(GC_DELREF(obj) == 0)) {
 			zend_objects_store_del(obj);