fix failing tests for non-opcache

Author: withinboredom

Zend/zend_ast.h

@@ -133,6 +133,7 @@ enum _zend_ast_kind {
 	ZEND_AST_YIELD,
 	ZEND_AST_COALESCE,
 	ZEND_AST_ASSIGN_COALESCE,
+	ZEND_AST_INNER_CLASS,
 
 	ZEND_AST_STATIC,
 	ZEND_AST_WHILE,

Zend/zend_compile.c

@@ -2268,6 +2268,7 @@ static void zend_adjust_for_fetch_type(zend_op *opline, znode *result, uint32_t
 
 	switch (type) {
 		case BP_VAR_R:
+		case BP_VAR_INNER_CLASS:
 			opline->result_type = IS_TMP_VAR;
 			result->op_type = IS_TMP_VAR;
 			return;
@@ -3253,6 +3254,8 @@ static zend_op *zend_compile_static_prop(znode *result, zend_ast *ast, uint32_t
 
 	if (delayed) {
 		opline = zend_delayed_emit_op(result, ZEND_FETCH_STATIC_PROP_R, &prop_node, NULL);
+	} else if (ast->kind == ZEND_AST_INNER_CLASS) {
+		opline = zend_emit_op(result, ZEND_FETCH_INNER_CLASS, &prop_node, NULL);
 	} else {
 		opline = zend_emit_op(result, ZEND_FETCH_STATIC_PROP_R, &prop_node, NULL);
 	}
@@ -11737,6 +11740,9 @@ static void zend_compile_expr_inner(znode *result, zend_ast *ast) /* {{{ */
 		case ZEND_AST_PARENT_PROPERTY_HOOK_CALL:
 			zend_compile_var(result, ast, BP_VAR_R, 0);
 			return;
+		case ZEND_AST_INNER_CLASS:
+			zend_compile_var(result, ast, BP_VAR_INNER_CLASS, 0);
+			return;
 		case ZEND_AST_ASSIGN:
 			zend_compile_assign(result, ast);
 			return;
@@ -11883,6 +11889,7 @@ static zend_op *zend_compile_var_inner(znode *result, zend_ast *ast, uint32_t ty
 		case ZEND_AST_NULLSAFE_PROP:
 			return zend_compile_prop(result, ast, type, by_ref);
 		case ZEND_AST_STATIC_PROP:
+		case ZEND_AST_INNER_CLASS:
 			return zend_compile_static_prop(result, ast, type, by_ref, 0);
 		case ZEND_AST_CALL:
 			zend_compile_call(result, ast, type);

Zend/zend_compile.h

@@ -1056,6 +1056,7 @@ ZEND_API zend_string *zend_type_to_string(zend_type type);
 #define BP_VAR_IS			3
 #define BP_VAR_FUNC_ARG		4
 #define BP_VAR_UNSET		5
+#define BP_VAR_INNER_CLASS	6
 
 #define ZEND_INTERNAL_FUNCTION		1
 #define ZEND_USER_FUNCTION			2

Zend/zend_execute.c

@@ -3647,7 +3647,7 @@ static zend_always_inline zval* zend_fetch_static_property_address(zend_property
 		result = CACHED_PTR(cache_slot + sizeof(void *));
 		property_info = CACHED_PTR(cache_slot + sizeof(void *) * 2);
 
-		if ((fetch_type == BP_VAR_R || fetch_type == BP_VAR_RW)
+		if ((fetch_type == BP_VAR_R || fetch_type == BP_VAR_INNER_CLASS || fetch_type == BP_VAR_RW)
 				&& UNEXPECTED(Z_TYPE_P(result) == IS_UNDEF)
 				&& ZEND_TYPE_IS_SET(property_info->type)) {
 			zend_throw_error(NULL, "Typed static property %s::$%s must not be accessed before initialization",

Zend/zend_language_parser.y

@@ -879,7 +879,7 @@ type_without_static:
 
 inner_type_without_static:
 		name T_PAAMAYIM_NEKUDOTAYIM identifier
-			{ $$ = zend_ast_create(ZEND_AST_CLASS_CONST, $1, $3); }
+			{ $$ = zend_ast_create(ZEND_AST_INNER_CLASS, $1, $3); }
 
 union_type_without_static_element:
                 type_without_static { $$ = $1; }
@@ -1583,7 +1583,7 @@ new_variable:
 	|	new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable
 			{ $$ = zend_ast_create(ZEND_AST_STATIC_PROP, $1, $3); }
 	|	class_name T_PAAMAYIM_NEKUDOTAYIM class_name
-			{ $$ = zend_ast_create(ZEND_AST_STATIC_PROP, $1, $3); }
+			{ $$ = zend_ast_create(ZEND_AST_INNER_CLASS, $1, $3); }
 ;
 
 member_name:

Zend/zend_object_handlers.c

@@ -1995,7 +1995,11 @@ ZEND_API zval *zend_std_get_static_property_with_info(zend_class_entry *ce, zend
 	ret = CE_STATIC_MEMBERS(ce) + property_info->offset;
 	ZVAL_DEINDIRECT(ret);
 
-	if (UNEXPECTED((type == BP_VAR_R || type == BP_VAR_RW)
+	if (UNEXPECTED((type == BP_VAR_INNER_CLASS) && !(property_info->flags & ZEND_ACC_INNER_CLASS_REFERENCE))) {
+		zend_throw_error(NULL, "Unexpected property or const: %s::%s, expecting inner class name", ZSTR_VAL(property_info->ce->name), ZSTR_VAL(property_name));
+	}
+
+	if (UNEXPECTED((type == BP_VAR_R || type == BP_VAR_INNER_CLASS || type == BP_VAR_RW)
 				&& Z_TYPE_P(ret) == IS_UNDEF && ZEND_TYPE_IS_SET(property_info->type))) {
 		zend_throw_error(NULL, "Typed static property %s::$%s must not be accessed before initialization",
 			ZSTR_VAL(property_info->ce->name), ZSTR_VAL(property_name));

Zend/zend_vm_def.h

@@ -1895,6 +1895,12 @@ ZEND_VM_HANDLER(176, ZEND_FETCH_STATIC_PROP_IS, ANY, CLASS_FETCH, CACHE_SLOT)
 	ZEND_VM_DISPATCH_TO_HELPER(zend_fetch_static_prop_helper, type, BP_VAR_IS);
 }
 
+/* No specialization for op_types (CONST|TMPVAR|CV, UNUSED|CLASS_FETCH|CONST|VAR) */
+ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, ANY, CLASS_FETCH, CACHE_SLOT)
+{
+  ZEND_VM_DISPATCH_TO_HELPER(zend_fetch_static_prop_helper, type, BP_VAR_INNER_CLASS);
+}
+
 ZEND_VM_COLD_CONSTCONST_HANDLER(81, ZEND_FETCH_DIM_R, CONST|TMPVAR|CV, CONST|TMPVAR|CV)
 {
 	USE_OPLINE