Fixed IS_UNDEF handling

dstogov · dstogov · commit ca159561dbdc · 2020-07-03T10:52:03.000+03:00
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -1612,16 +1612,12 @@ static zend_bool is_power_of_two(uint32_t x)
 
 static zend_bool has_concrete_type(uint32_t value_type)
 {
-	if (value_type & MAY_BE_UNDEF) {
-		value_type |= MAY_BE_NULL;
-	}
-	value_type &= MAY_BE_ANY;
-	return is_power_of_two (value_type);
+	return is_power_of_two (value_type & (MAY_BE_ANY|MAY_BE_UNDEF));
 }
 
 static uint32_t concrete_type(uint32_t value_type)
 {
-	return floor_log2(value_type & MAY_BE_ANY);
+	return floor_log2(value_type & (MAY_BE_ANY|MAY_BE_UNDEF));
 }
 
 static inline zend_bool is_signed(double d)

Original file line number	Diff line number	Diff line change
`@@ -1612,16 +1612,12 @@ static zend_bool is_power_of_two(uint32_t x)`
`1612`	`1612`
`1613`	`1613`	`static zend_bool has_concrete_type(uint32_t value_type)`
`1614`	`1614`	`{`
`1615`		`- if (value_type & MAY_BE_UNDEF) {`
`1616`		`- value_type \|= MAY_BE_NULL;`
`1617`		`- }`
`1618`		`- value_type &= MAY_BE_ANY;`
`1619`		`- return is_power_of_two (value_type);`
	`1615`	`+ return is_power_of_two (value_type & (MAY_BE_ANY\|MAY_BE_UNDEF));`
`1620`	`1616`	`}`
`1621`	`1617`
`1622`	`1618`	`static uint32_t concrete_type(uint32_t value_type)`
`1623`	`1619`	`{`
`1624`		`- return floor_log2(value_type & MAY_BE_ANY);`
	`1620`	`+ return floor_log2(value_type & (MAY_BE_ANY\|MAY_BE_UNDEF));`
`1625`	`1621`	`}`
`1626`	`1622`
`1627`	`1623`	`static inline zend_bool is_signed(double d)`