Fix DefaultPythonIntegerExports#EqualsWithState for PInt and style fixes

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java

@@ -142,7 +142,7 @@ static class Length {
         static int cachedLen(DynamicObjectStorage self,
                         @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
                         @Cached(value = "keyArray(self)", dimensions = 1) Object[] keys,
-                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
+                        @Exclusive @Cached ReadAttributeFromDynamicObjectNode readNode) {
             int len = 0;
             for (int i = 0; i < keys.length; i++) {
                 Object key = keys[i];
@@ -155,7 +155,7 @@ static int cachedLen(DynamicObjectStorage self,
         static int cachedKeys(DynamicObjectStorage self,
                         @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
                         @Cached(value = "keyArray(self)", dimensions = 1) Object[] keys,
-                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
+                        @Exclusive @Cached ReadAttributeFromDynamicObjectNode readNode) {
             int len = 0;
             for (int i = 0; i < keys.length; i++) {
                 Object key = keys[i];
@@ -379,7 +379,7 @@ static class ForEachUntyped {
         static Object cachedLen(DynamicObjectStorage self, ForEachNode<Object> node, Object firstValue,
                         @Exclusive @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
                         @Cached(value = "keyArray(self)", dimensions = 1) Object[] keys,
-                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
+                        @Exclusive @Cached ReadAttributeFromDynamicObjectNode readNode) {
             Object result = firstValue;
             for (int i = 0; i < keys.length; i++) {
                 Object key = keys[i];
@@ -392,7 +392,7 @@ static Object cachedLen(DynamicObjectStorage self, ForEachNode<Object> node, Obj
         static Object cachedKeys(DynamicObjectStorage self, ForEachNode<Object> node, Object firstValue,
                         @Exclusive @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
                         @Cached(value = "keyArray(self)", dimensions = 1) Object[] keys,
-                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
+                        @Exclusive @Cached ReadAttributeFromDynamicObjectNode readNode) {
             Object result = firstValue;
             for (int i = 0; i < keys.length; i++) {
                 Object key = keys[i];
@@ -403,7 +403,7 @@ static Object cachedKeys(DynamicObjectStorage self, ForEachNode<Object> node, Ob
 
         @Specialization(replaces = "cachedKeys")
         static Object addAll(DynamicObjectStorage self, ForEachNode<Object> node, Object firstValue,
-                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
+                        @Exclusive @Cached ReadAttributeFromDynamicObjectNode readNode) {
             return cachedKeys(self, node, firstValue, self.store.getShape(), keyArray(self), readNode);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashMapStorage.java

@@ -134,7 +134,7 @@ private static Object get(LinkedHashMap<Object, Object> values, Object key) {
         }
 
         @Specialization(guards = "!isSupportedKey(key, profile)", limit = "3")
-        static Object getItemNotSupportedKey(HashMapStorage self, Object key, @SuppressWarnings("unused") ThreadState state,
+        static Object getItemNotSupportedKey(@SuppressWarnings("unused") HashMapStorage self, Object key, @SuppressWarnings("unused") ThreadState state,
                         @SuppressWarnings("unused") @Cached IsBuiltinClassProfile profile,
                         @CachedLibrary("key") PythonObjectLibrary lib,
                         @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonIntegerExports.java

@@ -213,7 +213,7 @@ static boolean il(Integer receiver, long other, PythonObjectLibrary oLib, Thread
 
         @Specialization
         static boolean iI(Integer receiver, PInt other, PythonObjectLibrary oLib, ThreadState threadState) {
-            return oLib.equals(other, receiver, oLib);
+            return other.compareTo((long) receiver) == 0;
         }
 
         @Specialization