Fix dumping of private uninitialized props

By switching to the slot API, which doesn't need unmangled keys
and is faster anyway...

Also moving those APIs to a place that has a complete prop_info
def.

Author: nikic

Zend/zend_object_handlers.c

@@ -634,8 +634,7 @@ static zend_always_inline zend_property_info *prop_info_for_offset(
 	if (cache_slot) {
 		return cache_slot[2];
 	} else {
-		zend_property_info *info = zend_get_property_info_for_slot(obj, OBJ_PROP(obj, prop_offset));
-		return (info && info->type) ? info : NULL;
+		return zend_get_typed_property_info_for_slot(obj, OBJ_PROP(obj, prop_offset));
 	}
 }
 

Zend/zend_object_handlers.h

@@ -246,14 +246,6 @@ ZEND_API HashTable *zend_get_properties_for(zval *obj, zend_prop_purpose purpose
 	} \
 } while (0)
 
-static inline struct _zend_property_info *zend_get_property_info_for_slot(zend_object *obj, zval *slot)
-{
-	struct _zend_property_info **table = obj->ce->properties_info_table;
-	intptr_t prop_num = slot - obj->properties_table;
-	ZEND_ASSERT(prop_num >= 0 && prop_num < obj->ce->default_properties_count);
-	return table[prop_num];
-}
-
 #define zend_free_trampoline(func) do { \
 		if ((func) == &EG(trampoline)) { \
 			EG(trampoline).common.function_name = NULL; \

Zend/zend_objects_API.h

@@ -95,6 +95,24 @@ static zend_always_inline void *zend_object_alloc(size_t obj_size, zend_class_en
 	return obj;
 }
 
+static inline zend_property_info *zend_get_property_info_for_slot(zend_object *obj, zval *slot)
+{
+	zend_property_info **table = obj->ce->properties_info_table;
+	intptr_t prop_num = slot - obj->properties_table;
+	ZEND_ASSERT(prop_num >= 0 && prop_num < obj->ce->default_properties_count);
+	return table[prop_num];
+}
+
+/* Helper for cases where we're only interested in property info of typed properties. */
+static inline zend_property_info *zend_get_typed_property_info_for_slot(zend_object *obj, zval *slot)
+{
+	zend_property_info *prop_info = zend_get_property_info_for_slot(obj, slot);
+	if (prop_info && prop_info->type) {
+		return prop_info;
+	}
+	return NULL;
+}
+
 
 #endif /* ZEND_OBJECTS_H */
 

Zend/zend_vm_def.h

@@ -6458,9 +6458,9 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY, JMP_ADDR)
 						if (EXPECTED(value_type != IS_UNDEF)
 						 && EXPECTED(zend_check_property_access(Z_OBJ_P(array), p->key, 0) == SUCCESS)) {
 							if ((value_type & Z_TYPE_MASK) != IS_REFERENCE) {
-								zend_property_info *prop_info = zend_get_property_info_for_slot(
-									Z_OBJ_P(array), value);
-								if (UNEXPECTED(prop_info && prop_info->type)) {
+								zend_property_info *prop_info =
+									zend_get_typed_property_info_for_slot(Z_OBJ_P(array), value);
+								if (UNEXPECTED(prop_info)) {
 									ZVAL_NEW_REF(value, value);
 									ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(value), prop_info);
 									value_type = IS_REFERENCE_EX;

Zend/zend_vm_execute.h

@@ -23904,9 +23904,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_RW_SPEC_VAR_HANDLER(Z
 						if (EXPECTED(value_type != IS_UNDEF)
 						 && EXPECTED(zend_check_property_access(Z_OBJ_P(array), p->key, 0) == SUCCESS)) {
 							if ((value_type & Z_TYPE_MASK) != IS_REFERENCE) {
-								zend_property_info *prop_info = zend_get_property_info_for_slot(
-									Z_OBJ_P(array), value);
-								if (UNEXPECTED(prop_info && prop_info->type)) {
+								zend_property_info *prop_info =
+									zend_get_typed_property_info_for_slot(Z_OBJ_P(array), value);
+								if (UNEXPECTED(prop_info)) {
 									ZVAL_NEW_REF(value, value);
 									ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(value), prop_info);
 									value_type = IS_REFERENCE_EX;

ext/standard/var.c

@@ -175,7 +175,7 @@ PHPAPI void php_var_dump(zval *struc, int level) /* {{{ */
 					if (Z_TYPE_P(val) == IS_INDIRECT) {
 						val = Z_INDIRECT_P(val);
 						if (key) {
-							prop_info = zend_object_fetch_property_type_info(Z_OBJCE_P(struc), key, NULL);
+							prop_info = zend_get_typed_property_info_for_slot(Z_OBJ_P(struc), val);
 						}
 					}
 
@@ -359,7 +359,7 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level) /* {{{ */
 				if (Z_TYPE_P(val) == IS_INDIRECT) {
 					val = Z_INDIRECT_P(val);
 					if (key) {
-						prop_info = zend_object_fetch_property_type_info(Z_OBJCE_P(struc), key, NULL);
+						prop_info = zend_get_typed_property_info_for_slot(Z_OBJ_P(struc), val);
 					}
 				}