php
diff --git a/‎Zend/zend_execute.c‎
Lines changed: 15 additions & 0 deletions b/‎Zend/zend_execute.c‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎Zend/zend_vm_def.h‎
Lines changed: 1 addition & 2 deletions b/‎Zend/zend_vm_def.h‎
Lines changed: 1 addition & 2 deletions
@@ -386,6 +386,21 @@ static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_W(uint32_t var EXECUTE_D
 	return ret;
 }
 
+static zend_always_inline zval *_get_zval_ptr_tmpvarcv(int op_type, znode_op node, int type EXECUTE_DATA_DC)
+{
+	if (op_type & (IS_TMP_VAR|IS_VAR)) {
+		if (op_type == IS_TMP_VAR) {
+			return _get_zval_ptr_tmp(node.var EXECUTE_DATA_CC);
+		} else {
+			ZEND_ASSERT(op_type == IS_VAR);
+			return _get_zval_ptr_var_deref(node.var EXECUTE_DATA_CC);
+		}
+	} else {
+		ZEND_ASSERT(op_type == IS_CV);
+		return _get_zval_ptr_cv_deref(node.var, type EXECUTE_DATA_CC);
+	}
+}
+
 static zend_always_inline zval *_get_zval_ptr(int op_type, znode_op node, int type EXECUTE_DATA_DC OPLINE_DC)
 {
 	if (op_type & (IS_TMP_VAR|IS_VAR)) {
 
@@ -5854,8 +5854,7 @@ ZEND_VM_HOT_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED|CONST_FETCH, CONST, CACHE_SL
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }
 
-// FIXME: Small performance regression due to ANY. Can we make this CONST|ANY?
-ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, ANY, CACHE_SLOT)
+ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CONST|TMPVARCV, CACHE_SLOT)
 {
 	zend_class_entry *ce, *scope;
 	zend_class_constant *c;
Original file line number	Diff line number	Diff line change
`@@ -5854,8 +5854,7 @@ ZEND_VM_HOT_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED\|CONST_FETCH, CONST, CACHE_SL`
`5854`	`5854`	`ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();`
`5855`	`5855`	`}`
`5856`	`5856`
`5857`		`-// FIXME: Small performance regression due to ANY. Can we make this CONST\|ANY?`
`5858`		`-ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR\|CONST\|UNUSED\|CLASS_FETCH, ANY, CACHE_SLOT)`
	`5857`	`+ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR\|CONST\|UNUSED\|CLASS_FETCH, CONST\|TMPVARCV, CACHE_SLOT)`
`5859`	`5858`	`{`
`5860`	`5859`	`zend_class_entry ce, scope;`
`5861`	`5860`	`zend_class_constant *c;`