Revert "Speed up self::method() calls (no ZEND_FETCH_CLASS)"

This reverts commit 8c33bdb976e957ea67ebffd424e0a133a79c6ebe.

1 files changed, 5 insertions, 17 deletions

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 6d8f794ae4..d30db31bd9 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3301,22 +3301,14 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{
 
 	znode class_node, method_node;
 	zend_op *opline;
-	uint32_t op_off;
-	uint32_t fetch_type = class_ast->kind == ZEND_AST_ZVAL ? zend_get_class_fetch_type_ast(class_ast) : -1;
+	zend_ulong extended_value = 0;
 
-	if (fetch_type == ZEND_FETCH_CLASS_DEFAULT) {
+	if (zend_is_const_default_class_ref(class_ast)) {
 		class_node.op_type = IS_CONST;
 		ZVAL_STR(&class_node.u.constant, zend_resolve_class_name_ast(class_ast));
 	} else {
-		/* we do not have any reference to the extends_ast/name of parent at compile-time, hence only resolving self:: for now */
-		if (zend_is_scope_known() && fetch_type == ZEND_FETCH_CLASS_SELF) {
-			zend_ensure_valid_class_fetch_type(fetch_type);
-
-			class_node.op_type = IS_CONST;
-			ZVAL_STR_COPY(&class_node.u.constant, CG(active_class_entry)->name);
-		} else {
-			opline = zend_compile_class_ref(&class_node, class_ast, 1);
-		}
+		opline = zend_compile_class_ref(&class_node, class_ast, 1);
+		extended_value = opline->extended_value;
 	}
 
 	zend_compile_expr(&method_node, method_ast);
@@ -3333,7 +3325,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{
 
 	opline = get_next_op(CG(active_op_array));
 	opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
-	op_off = opline - CG(active_op_array)->opcodes;
+	opline->extended_value = extended_value;
 
 	zend_set_class_name_op1(opline, &class_node);
 
@@ -3351,10 +3343,6 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{
 	}
 
 	zend_compile_call_common(result, args_ast, NULL);
-
-	if (fetch_type == ZEND_FETCH_CLASS_SELF || fetch_type == ZEND_FETCH_CLASS_PARENT) {
-		CG(active_op_array)->opcodes[op_off].extended_value |= ZEND_FETCH_CLASS_FORWARD;
-	}
 }
 /* }}} */