Fix decoding condition profile index

msimacek · msimacek · commit 596b6e826e11 · 2022-08-10T10:31:29.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java
@@ -769,7 +769,7 @@ private boolean profileCondition(boolean value, byte[] localBC, int bci, boolean
         if (!useCachedNodes) {
             return value;
         }
-        int index = Byte.toUnsignedInt(localBC[bci + 2]) & Byte.toUnsignedInt(localBC[bci + 3]) << 8;
+        int index = Byte.toUnsignedInt(localBC[bci + 2]) | Byte.toUnsignedInt(localBC[bci + 3]) << 8;
         int t = conditionProfiles[index];
         int f = conditionProfiles[index + 1];
         boolean val = value;

Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ private boolean profileCondition(boolean value, byte[] localBC, int bci, boolean`
`769`	`769`	`if (!useCachedNodes) {`
`770`	`770`	`return value;`
`771`	`771`	`}`
`772`		`- int index = Byte.toUnsignedInt(localBC[bci + 2]) & Byte.toUnsignedInt(localBC[bci + 3]) << 8;`
	`772`	`+ int index = Byte.toUnsignedInt(localBC[bci + 2]) \| Byte.toUnsignedInt(localBC[bci + 3]) << 8;`
`773`	`773`	`int t = conditionProfiles[index];`
`774`	`774`	`int f = conditionProfiles[index + 1];`
`775`	`775`	`boolean val = value;`