- Make new 'is' operator work with classes only and return false when

- the object isn't of the said class or the value isn't an object.

1 files changed, 3 insertions, 10 deletions

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 99aa9709a7..1561c2b9bf 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2724,23 +2724,16 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC
 }
 
 
-void zend_do_is_type(znode *result, znode *expr, znode *class, int type TSRMLS_DC)
+void zend_do_is_class(znode *result, znode *expr, znode *class, int type TSRMLS_DC)
 {
 	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
-	opline->opcode = ZEND_IS_TYPE;
+	opline->opcode = ZEND_IS_CLASS;
 	opline->result.op_type = IS_TMP_VAR;
 	opline->result.u.var = get_temporary_variable(CG(active_op_array));
 	opline->op1 = *expr;
 
-	if (class) {
-		opline->op2 = *class;
-		opline->extended_value = 1;
-	} else {
-		opline->op2.u.constant.value.lval = type;
-		SET_UNUSED(opline->op2);
-		opline->extended_value = 0;
-	}
+	opline->op2 = *class;
 
 	*result = opline->result;
 }