always unpack PStrings to Strings when reading and writing attributes

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/ReadAttributeFromObjectNode.java

@@ -40,6 +40,7 @@
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -85,6 +86,14 @@ protected static boolean checkShape(@SuppressWarnings("unused") PythonObject obj
         return cachedObject.getStorage().getShape() == cachedShape;
     }
 
+    protected Object attrKey(Object key) {
+        if (key instanceof PString) {
+            return ((PString) key).getValue();
+        } else {
+            return key;
+        }
+    }
+
     @SuppressWarnings("unused")
     @Specialization(limit = "1", //
                     guards = {
@@ -101,12 +110,13 @@ protected static boolean checkShape(@SuppressWarnings("unused") PythonObject obj
     protected Object readDirectFinal(PythonObject object, Object key,
                     @Cached("object") PythonObject cachedObject,
                     @Cached("key") Object cachedKey,
+                    @Cached("attrKey(key)") Object attrKey,
                     @Cached("object.getStorage().getShape()") Shape cachedShape,
                     @Cached("cachedShape.getValidAssumption()") Assumption layoutAssumption,
-                    @Cached("getLocationOrNull(cachedShape.getProperty(key))") Location loc,
+                    @Cached("getLocationOrNull(cachedShape.getProperty(attrKey))") Location loc,
                     @Cached("loc.getFinalAssumption()") Assumption finalAssumption,
                     @Cached("readFinalValue(object, loc)") Object cachedValue) {
-        assert assertFinal(object, key, cachedValue);
+        assert assertFinal(object, attrKey, cachedValue);
         return cachedValue;
     }
 
@@ -125,9 +135,10 @@ private static boolean assertFinal(PythonObject object, Object key, Object cache
                     assumptions = "layoutAssumption")
     protected Object readDirect(PythonObject object, Object key,
                     @Cached("key") Object cachedKey,
+                    @Cached("attrKey(cachedKey)") Object attrKey,
                     @Cached("object.getStorage().getShape()") Shape cachedShape,
                     @Cached("cachedShape.getValidAssumption()") Assumption layoutAssumption,
-                    @Cached("getLocationOrNull(cachedShape.getProperty(key))") Location loc) {
+                    @Cached("getLocationOrNull(cachedShape.getProperty(attrKey))") Location loc) {
         if (loc == null) {
             return PNone.NO_VALUE;
         } else {
@@ -151,7 +162,7 @@ protected Object updateShapeAndRead(PythonObject object, Object key,
 
     @Specialization(replaces = "readDirect")
     protected Object readIndirect(PythonObject object, Object key) {
-        Object value = object.getStorage().get(key);
+        Object value = object.getStorage().get(attrKey(key));
         if (value == null) {
             return PNone.NO_VALUE;
         } else {
@@ -163,7 +174,7 @@ protected Object readIndirect(PythonObject object, Object key) {
     protected Object readForeign(TruffleObject object, Object key,
                     @Cached("createReadNode()") Node readNode) {
         try {
-            return ForeignAccess.sendRead(readNode, object, key);
+            return ForeignAccess.sendRead(readNode, object, attrKey(key));
         } catch (UnknownIdentifierException | UnsupportedMessageException e) {
             return PNone.NO_VALUE;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/WriteAttributeToObjectNode.java

@@ -39,6 +39,7 @@
 package com.oracle.graal.python.nodes.attributes;
 
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -65,6 +66,14 @@ protected Location getLocationOrNull(Property prop) {
         return prop == null ? null : prop.getLocation();
     }
 
+    protected Object attrKey(Object key) {
+        if (key instanceof PString) {
+            return ((PString) key).getValue();
+        } else {
+            return key;
+        }
+    }
+
     @SuppressWarnings("unused")
     @Specialization(guards = {
                     "object.getStorage().getShape() == cachedShape",
@@ -82,7 +91,7 @@ protected Object updateShapeAndWrite(PythonObject object, Object key, Object val
     @Specialization(limit = "getIntOption(getContext(), AttributeAccessInlineCacheMaxDepth)", //
                     guards = {
                                     "object.getStorage().getShape() == cachedShape",
-                                    "cachedKey.equals(key)",
+                                    "cachedKey == key",
                                     "loc != null",
                                     "loc.canSet(value)"
                     }, //
@@ -92,9 +101,10 @@ protected Object updateShapeAndWrite(PythonObject object, Object key, Object val
                     })
     protected boolean doDirect(PythonObject object, Object key, Object value,
                     @Cached("key") Object cachedKey,
+                    @Cached("attrKey(cachedKey)") Object attrKey,
                     @Cached("object.getStorage().getShape()") Shape cachedShape,
                     @Cached("cachedShape.getValidAssumption()") Assumption layoutAssumption,
-                    @Cached("getLocationOrNull(cachedShape.getProperty(key))") Location loc) {
+                    @Cached("getLocationOrNull(cachedShape.getProperty(attrKey))") Location loc) {
         try {
             loc.set(object.getStorage(), value);
         } catch (IncompatibleLocationException | FinalLocationException e) {
@@ -109,7 +119,7 @@ protected boolean doDirect(PythonObject object, Object key, Object value,
     @Specialization(limit = "getIntOption(getContext(), AttributeAccessInlineCacheMaxDepth)", //
                     guards = {
                                     "object.getStorage().getShape() == cachedShape",
-                                    "cachedKey.equals(key)",
+                                    "cachedKey == key",
                                     "loc == null || !loc.canSet(value)",
                                     "newLoc.canSet(value)"
                     }, //
@@ -119,12 +129,13 @@ protected boolean doDirect(PythonObject object, Object key, Object value,
                     })
     protected boolean defineDirect(PythonObject object, Object key, Object value,
                     @Cached("key") Object cachedKey,
+                    @Cached("attrKey(key)") Object attrKey,
                     @Cached("object.getStorage().getShape()") Shape cachedShape,
                     @Cached("cachedShape.getValidAssumption()") Assumption layoutAssumption,
-                    @Cached("getLocationOrNull(cachedShape.getProperty(key))") Location loc,
-                    @Cached("cachedShape.defineProperty(key, value, 0)") Shape newShape,
+                    @Cached("getLocationOrNull(cachedShape.getProperty(attrKey))") Location loc,
+                    @Cached("cachedShape.defineProperty(attrKey, value, 0)") Shape newShape,
                     @Cached("newShape.getValidAssumption()") Assumption newLayoutAssumption,
-                    @Cached("getLocationOrNull(newShape.getProperty(key))") Location newLoc) {
+                    @Cached("getLocationOrNull(newShape.getProperty(attrKey))") Location newLoc) {
         try {
             newLoc.set(object.getStorage(), value, cachedShape, newShape);
         } catch (IncompatibleLocationException e) {
@@ -138,7 +149,7 @@ protected boolean defineDirect(PythonObject object, Object key, Object value,
     @TruffleBoundary
     @Specialization(replaces = {"doDirect", "defineDirect"}, guards = {"object.getStorage().getShape().isValid()"})
     protected boolean doIndirect(PythonObject object, Object key, Object value) {
-        object.setAttribute(key, value);
+        object.setAttribute(attrKey(key), value);
         return true;
     }