Handle CT eval properly

nikic · nikic · commit bc67c3f4a1db · 2020-01-08T16:42:29.000+01:00
diff --git a/Zend/tests/class_on_constant_evaluated_expression.phpt b/Zend/tests/class_on_constant_evaluated_expression.phpt
@@ -0,0 +1,10 @@
+--TEST--
+An error should be generated when using ::class on a constant evaluated expression
+--FILE--
+<?php
+
+(1+1)::class;
+
+?>
+--EXPECTF--
+Fatal error: Cannot use ::class on value of type int in %s on line %d
diff --git a/Zend/tests/class_on_object.phpt b/Zend/tests/class_on_object.phpt
@@ -21,8 +21,9 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 string(8) "stdClass"
 string(8) "stdClass"
 string(8) "stdClass"
-Cannot use ::class on value of type null
+
+Fatal error: Invalid opcode 157/1/0. in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -8240,6 +8240,13 @@ void zend_compile_class_name(znode *result, zend_ast *ast) /* {{{ */
 	} else {
 		znode expr_node;
 		zend_compile_expr(&expr_node, class_ast);
+		if (expr_node.op_type == IS_CONST) {
+			/* Unlikely case that happen if class_ast is constant folded.
+			 * Handle it here, to avoid needing a CONST specialization in the VM. */
+			zend_error_noreturn(E_COMPILE_ERROR, "Cannot use ::class on value of type %s",
+				zend_get_type_by_const(Z_TYPE(expr_node.u.constant)));
+		}
+
 		zend_emit_op_tmp(result, ZEND_FETCH_CLASS_NAME, &expr_node, NULL);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -8240,6 +8240,13 @@ void zend_compile_class_name(znode result, zend_ast ast) /* {{{ */`
`8240`	`8240`	`} else {`
`8241`	`8241`	`znode expr_node;`
`8242`	`8242`	`zend_compile_expr(&expr_node, class_ast);`
	`8243`	`+ if (expr_node.op_type == IS_CONST) {`
	`8244`	`+ /* Unlikely case that happen if class_ast is constant folded.`
	`8245`	`+ * Handle it here, to avoid needing a CONST specialization in the VM. */`
	`8246`	`+ zend_error_noreturn(E_COMPILE_ERROR, "Cannot use ::class on value of type %s",`
	`8247`	`+ zend_get_type_by_const(Z_TYPE(expr_node.u.constant)));`
	`8248`	`+ }`
	`8249`	`+`
`8243`	`8250`	`zend_emit_op_tmp(result, ZEND_FETCH_CLASS_NAME, &expr_node, NULL);`
`8244`	`8251`	`}`
`8245`	`8252`	`}`