Combine guards to prevent two bitlength() calls

otethal · otethal · commit 14ad44b8a6fe · 2020-07-27T10:52:57.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/NarrowBigIntegerNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/NarrowBigIntegerNode.java
@@ -64,7 +64,7 @@ int narrowToInt(BigInteger x) {
         return PInt.intValue(x);
     }
 
-    @Specialization(guards = {"fitsIntoLong(x)", "!fitsIntoInt(x)"})
+    @Specialization(guards = "fitsIntoLongButNotInt(x)")
     long narrowToLong(BigInteger x) {
         return PInt.longValue(x);
     }
@@ -80,6 +80,12 @@ static boolean fitsIntoInt(BigInteger x) {
         return x.bitLength() <= 31;
     }
 
+    @TruffleBoundary
+    static boolean fitsIntoLongButNotInt(BigInteger x) {
+        int bitLen = x.bitLength();
+        return bitLen > 31 && bitLen <= 63;
+    }
+
     @TruffleBoundary
     static boolean fitsIntoLong(BigInteger x) {
         return x.bitLength() <= 63;

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ int narrowToInt(BigInteger x) {`
`64`	`64`	`return PInt.intValue(x);`
`65`	`65`	`}`
`66`	`66`
`67`		`- @Specialization(guards = {"fitsIntoLong(x)", "!fitsIntoInt(x)"})`
	`67`	`+ @Specialization(guards = "fitsIntoLongButNotInt(x)")`
`68`	`68`	`long narrowToLong(BigInteger x) {`
`69`	`69`	`return PInt.longValue(x);`
`70`	`70`	`}`
`@@ -80,6 +80,12 @@ static boolean fitsIntoInt(BigInteger x) {`
`80`	`80`	`return x.bitLength() <= 31;`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ @TruffleBoundary`
	`84`	`+ static boolean fitsIntoLongButNotInt(BigInteger x) {`
	`85`	`+ int bitLen = x.bitLength();`
	`86`	`+ return bitLen > 31 && bitLen <= 63;`
	`87`	`+ }`
	`88`	`+`
`83`	`89`	`@TruffleBoundary`
`84`	`90`	`static boolean fitsIntoLong(BigInteger x) {`
`85`	`91`	`return x.bitLength() <= 63;`