Commit 7a954ac

committed

Do not mark multiplication op as commutative

As it might not be when an internal object overloads the multiplication operation

1 parent 41c3873 commit 7a954acCopy full SHA for 7a954ac

File tree

+67

-15

lines changed

+67

-15

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ ZEND_VM_HELPER(zend_mul_helper, ANY, ANY, zval op_1, zval op_2)`
`162`	`162`	`ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();`
`163`	`163`	`}`
`164`	`164`
`165`		`-ZEND_VM_COLD_CONSTCONST_HANDLER(3, ZEND_MUL, CONST\|TMPVARCV, CONST\|TMPVARCV, SPEC(COMMUTATIVE))`
	`165`	`+ZEND_VM_COLD_CONSTCONST_HANDLER(3, ZEND_MUL, CONST\|TMPVARCV, CONST\|TMPVARCV)`
`166`	`166`	`{`
`167`	`167`	`USE_OPLINE`
`168`	`168`	`zval op1, op2, *result;`
`@@ -7591,7 +7591,7 @@ ZEND_VM_HOT_NOCONST_HANDLER(198, ZEND_JMP_NULL, CONST\|TMP\|VAR\|CV, JMP_ADDR)`
`7591`	`7591`	`uint32_t short_circuiting_type = opline->extended_value & ZEND_SHORT_CIRCUITING_CHAIN_MASK;`
`7592`	`7592`	`if (EXPECTED(short_circuiting_type == ZEND_SHORT_CIRCUITING_CHAIN_EXPR)) {`
`7593`	`7593`	`ZVAL_NULL(result);`
`7594`		`- if (OP1_TYPE == IS_CV`
	`7594`	`+ if (OP1_TYPE == IS_CV`
`7595`	`7595`	`&& UNEXPECTED(Z_TYPE_P(val) == IS_UNDEF)`
`7596`	`7596`	`&& (opline->extended_value & ZEND_JMP_NULL_BP_VAR_IS) == 0`
`7597`	`7597`	`) {`

Lines changed: 61 additions & 10 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@`
`33`	`33`	`_(48, ZEND_SUB_SPEC_TMPVARCV_TMPVARCV) \`
`34`	`34`	`_(50, ZEND_SUB_SPEC_TMPVARCV_TMPVARCV) \`
`35`	`35`	`_(51, ZEND_MUL_SPEC_CONST_CONST) \`
	`36`	`+ _(52, ZEND_MUL_SPEC_CONST_TMPVARCV) \`
	`37`	`+ _(53, ZEND_MUL_SPEC_CONST_TMPVARCV) \`
	`38`	`+ _(55, ZEND_MUL_SPEC_CONST_TMPVARCV) \`
`36`	`39`	`_(56, ZEND_MUL_SPEC_TMPVARCV_CONST) \`
`37`	`40`	`_(57, ZEND_MUL_SPEC_TMPVARCV_TMPVARCV) \`
`38`	`41`	`_(58, ZEND_MUL_SPEC_TMPVARCV_TMPVARCV) \`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ static uint32_t zend_vm_opcodes_flags[203] = {`
`232`	`232`	`0x00000000,`
`233`	`233`	`0x00000b0b,`
`234`	`234`	`0x00000b0b,`
`235`		`- 0x80000b0b,`
	`235`	`+ 0x00000b0b,`
`236`	`236`	`0x00000707,`
`237`	`237`	`0x00000b0b,`
`238`	`238`	`0x00000b0b,`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`Zend: test non commutative multiplication object handler`
`3`	`3`	`--EXTENSIONS--`
`4`	`4`	`zend_test`
`5`		`---XFAIL--`
`6`		`-Broken non commutative multiplication with more than 2 ops`
`7`	`5`	`--FILE--`
`8`	`6`	`<?php`
`9`	`7`

Comments

(0)