Move everything over to the slot API

I originall thought this wasn't possible, but now that it turned out
that object_handlers also always has slots available, we can do this.

Author: nikic

Zend/zend_execute.c

@@ -2603,6 +2603,24 @@ static zend_never_inline zend_bool zend_handle_fetch_obj_flags(
 	return 1;
 }
 
+static zend_always_inline zend_property_info *zend_object_fetch_property_type_info(
+		zend_object *obj, zval *slot)
+{
+	zend_property_info *info;
+
+	if (EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(obj->ce))) {
+		return NULL;
+	}
+
+	/* Not a declared property */
+	if (UNEXPECTED(slot < obj->properties_table ||
+			slot >= obj->properties_table + obj->ce->default_properties_count)) {
+		return NULL;
+	}
+
+	return zend_get_typed_property_info_for_slot(obj, slot);
+}
+
 static zend_always_inline void zend_fetch_property_address(zval *result, zval *container, uint32_t container_op_type, zval *prop_ptr, uint32_t prop_op_type, void **cache_slot, int type, uint32_t flags, zend_bool init_undef OPLINE_DC)
 {
 	zval *ptr;
@@ -2669,9 +2687,8 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c
 
 	ZVAL_INDIRECT(result, ptr);
 	if (flags && UNEXPECTED(zend_need_to_handle_fetch_obj_flags(flags, ptr))) {
-		zend_string *tmp_str, *prop_name = zval_get_tmp_string(prop_ptr, &tmp_str);
-		zend_property_info *prop_info = zend_object_fetch_property_type_info(Z_OBJCE_P(container), prop_name, NULL);
-		zend_tmp_string_release(tmp_str);
+		zend_property_info *prop_info =
+			zend_object_fetch_property_type_info(Z_OBJ_P(container), ptr);
 		if (prop_info && !zend_handle_fetch_obj_flags(result, ptr, prop_info, flags)) {
 			return;
 		}

Zend/zend_execute.h

@@ -441,30 +441,6 @@ ZEND_API int ZEND_FASTCALL zend_do_fcall_overloaded(zend_execute_data *call, zva
 
 #define ZEND_CLASS_HAS_TYPE_HINTS(ce) ((ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS) == ZEND_ACC_HAS_TYPE_HINTS)
 
-// TODO We might want to migrate this (or at least some of its uses) to the
-// zend_get_property_info_for_slot() API in the future.
-static zend_always_inline zend_property_info *zend_object_fetch_property_type_info(zend_class_entry *ce, zend_string *property, void **cache_slot)
-{
-	zend_property_info *info;
-
-	/* if we have a cache_slot, let's assume it's valid. Callers task to ensure validity! */
-	if (EXPECTED(cache_slot)) {
-		return (zend_property_info*) CACHED_PTR_EX(cache_slot + 2);
-	}
-
-	if (EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(ce))) {
-		return NULL;
-	}
-
-	info = zend_get_property_info(ce, property, 1);
-
-	if (info && info != ZEND_WRONG_PROPERTY_INFO && info->type) {
-		return info;
-	}
-
-	return NULL;
-}
-
 zend_bool zend_verify_property_type(zend_property_info *info, zval *property, zend_bool strict);
 ZEND_COLD void zend_verify_property_type_error(zend_property_info *info, zval *property);
 

Zend/zend_vm_def.h

@@ -834,6 +834,7 @@ ZEND_VM_C_LABEL(assign_op_object):
 					ZVAL_NULL(EX_VAR(opline->result.var));
 				}
 			} else {
+				zval *orig_zptr = zptr;
 				zend_reference *ref;
 				zend_bool is_typed_ref = 0;
 
@@ -846,9 +847,7 @@ ZEND_VM_C_LABEL(assign_op_object):
 				if (OP2_TYPE == IS_CONST) {
 					prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
 				} else {
-					zend_string *tmp_str, *prop_name = zval_get_tmp_string(property, &tmp_str);
-					prop_info = zend_object_fetch_property_type_info(Z_OBJCE_P(object), prop_name, NULL);
-					zend_tmp_string_release(tmp_str);
+					prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(object), orig_zptr);
 				}
 				if (UNEXPECTED(prop_info || is_typed_ref)) {
 					/* special case for typed properties */
@@ -1234,9 +1233,7 @@ ZEND_VM_C_LABEL(pre_incdec_object):
 				if (OP2_TYPE == IS_CONST) {
 					prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2);
 				} else {
-					zend_string *tmp_str, *prop_name = zval_get_tmp_string(property, &tmp_str);
-					prop_info = zend_object_fetch_property_type_info(Z_OBJCE_P(object), prop_name, NULL);
-					zend_tmp_string_release(tmp_str);
+					prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(object), zptr);
 				}
 				zend_pre_incdec_property_zval(zptr, prop_info, inc OPLINE_CC EXECUTE_DATA_CC);
 			}
@@ -1301,9 +1298,7 @@ ZEND_VM_C_LABEL(post_incdec_object):
 				if (OP2_TYPE == IS_CONST) {
 					prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
 				} else {
-					zend_string *tmp_str, *prop_name = zval_get_tmp_string(property, &tmp_str);
-					prop_info = zend_object_fetch_property_type_info(Z_OBJCE_P(object), prop_name, NULL);
-					zend_tmp_string_release(tmp_str);
+					prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(object), zptr);
 				}
 
 				zend_post_incdec_property_zval(zptr, prop_info, inc OPLINE_CC EXECUTE_DATA_CC);
@@ -2747,9 +2742,7 @@ ZEND_VM_HANDLER(200, ZEND_ASSIGN_OBJ_REF, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, C
 		if (OP2_TYPE == IS_CONST) {
 			prop_info = (zend_property_info *) CACHED_PTR_EX(cache_addr + 2);
 		} else {
-			zend_string *tmp_str, *prop_name = zval_get_tmp_string(property, &tmp_str);
-			prop_info = zend_object_fetch_property_type_info(Z_OBJCE_P(container), prop_name, NULL);
-			zend_tmp_string_release(tmp_str);
+			prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(container), variable_ptr);
 		}
 
 		if (UNEXPECTED(prop_info)) {