Fixed if/else if ordering

hikari-no-yume · hikari-no-yume · commit 545c296ef4b5 · 2014-09-17T20:41:20.000+01:00
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -83,7 +83,9 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)
 #elif SIZEOF_ZEND_LONG == 4
 static zend_always_inline zend_long zend_dval_to_lval(double d)
 {
-	if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
+	if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
+		return 0;
+	} else if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
 		double	two_pow_32 = pow(2., 32.),
 				dmod;
 
@@ -94,16 +96,16 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)
 			dmod = ceil(dmod) + two_pow_32;
 		}
 		return (zend_long)(zend_ulong)dmod;
-	} else if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
-		return 0;
 	}
 	return (zend_long)d;
 }
 #else
 static zend_always_inline zend_long zend_dval_to_lval(double d)
 {
+	if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
+		return 0;
 	/* >= as (double)ZEND_LONG_MAX is outside signed range */
-	if (d >= ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
+	} else if (d >= ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
 		double	two_pow_64 = pow(2., 64.),
 				dmod;
 
@@ -114,8 +116,6 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)
 			dmod += two_pow_64;
 		}
 		return (zend_long)(zend_ulong)dmod;
-	} else if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
-		return 0;
 	}
 	return (zend_long)d;
 }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,9 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)`
`83`	`83`	`#elif SIZEOF_ZEND_LONG == 4`
`84`	`84`	`static zend_always_inline zend_long zend_dval_to_lval(double d)`
`85`	`85`	`{`
`86`		`- if (d > ZEND_LONG_MAX \|\| d < ZEND_LONG_MIN) {`
	`86`	`+ if (UNEXPECTED(!zend_finite(d)) \|\| UNEXPECTED(zend_isnan(d))) {`
	`87`	`+ return 0;`
	`88`	`+ } else if (d > ZEND_LONG_MAX \|\| d < ZEND_LONG_MIN) {`
`87`	`89`	`double two_pow_32 = pow(2., 32.),`
`88`	`90`	`dmod;`
`89`	`91`
`@@ -94,16 +96,16 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)`
`94`	`96`	`dmod = ceil(dmod) + two_pow_32;`
`95`	`97`	`}`
`96`	`98`	`return (zend_long)(zend_ulong)dmod;`
`97`		`- } else if (UNEXPECTED(!zend_finite(d)) \|\| UNEXPECTED(zend_isnan(d))) {`
`98`		`- return 0;`
`99`	`99`	`}`
`100`	`100`	`return (zend_long)d;`
`101`	`101`	`}`
`102`	`102`	`#else`
`103`	`103`	`static zend_always_inline zend_long zend_dval_to_lval(double d)`
`104`	`104`	`{`
	`105`	`+ if (UNEXPECTED(!zend_finite(d)) \|\| UNEXPECTED(zend_isnan(d))) {`
	`106`	`+ return 0;`
`105`	`107`	`/* >= as (double)ZEND_LONG_MAX is outside signed range */`
`106`		`- if (d >= ZEND_LONG_MAX \|\| d < ZEND_LONG_MIN) {`
	`108`	`+ } else if (d >= ZEND_LONG_MAX \|\| d < ZEND_LONG_MIN) {`
`107`	`109`	`double two_pow_64 = pow(2., 64.),`
`108`	`110`	`dmod;`
`109`	`111`
`@@ -114,8 +116,6 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)`
`114`	`116`	`dmod += two_pow_64;`
`115`	`117`	`}`
`116`	`118`	`return (zend_long)(zend_ulong)dmod;`
`117`		`- } else if (UNEXPECTED(!zend_finite(d)) \|\| UNEXPECTED(zend_isnan(d))) {`
`118`		`- return 0;`
`119`	`119`	`}`
`120`	`120`	`return (zend_long)d;`
`121`	`121`	`}`