com php-src: Revert "Fix bug #69871 (short-circuiting failure with smart_branch)": Zend/tests/bug69871.phpt Zend/zend_execute.c

Commit: 235c7edb8b77981339895782e3ee2bac09e4a6e6 Author: Xinchen Hui <laruence@php.net> Fri, 19 Jun 2015 23:03:23 +0800 Parents: a7635e82f6ab1c33ee91846b6fc1bc6f8b8739b6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=235c7edb8b77981339895782e3ee2bac09e4a6e6 Log: Revert "Fix bug #69871 (short-circuiting failure with smart_branch)" This reverts commit fae6bedea5e094a1f6ddbd1a4453eaea340d1855. Bugs: https://bugs.php.net/69871 Changed paths: D Zend/tests/bug69871.phpt M Zend/zend_execute.c Diff: diff --git a/Zend/tests/bug69871.phpt b/Zend/tests/bug69871.phpt deleted file mode 100644 index 7b87a75..0000000 --- a/Zend/tests/bug69871..phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Bug #69871 (Short-circuiting failure with smart_branch) ---FILE-- -<?php - -$a = true; -if (isset($a) && 0) { - var_dump(true); -} else { - var_dump(false); -} - -?> ---EXPECT-- -bool(false) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 27274d3..9190eff 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2428,21 +2428,9 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut # define ZEND_VM_SMART_BRANCH(_result, _check) do { \ int __result; \ if (EXPECTED((opline+1)->opcode == ZEND_JMPZ)) { \ - if (UNEXPECTED((opline+1)->op1_type == IS_CONST)) { \ - zend_uchar __type = Z_TYPE_P(EX_CONSTANT((opline+1)->op1)); \ - ZEND_ASSERT(__type == IS_TRUE || __type == IS_FALSE); /* assume boolean */ \ - __result = __type == IS_TRUE; \ - } else { \ - __result = (_result); \ - } \ + __result = (_result); \ } else if (EXPECTED((opline+1)->opcode == ZEND_JMPNZ)) { \ - if (UNEXPECTED((opline+1)->op1_type == IS_CONST)) { \ - zend_uchar __type = Z_TYPE_P(EX_CONSTANT((opline+1)->op1)); \ - ZEND_ASSERT(__type == IS_TRUE || __type == IS_FALSE); /* assume boolean */ \ - __result = __type != IS_TRUE; \ - } else { \ - __result = !(_result); \ - } \ + __result = !(_result); \ } else { \ break; \ } \