Mappingproxy as __dict__ is also common, and should be specialized

Author: timfel

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

@@ -40,7 +40,9 @@
  */
 package com.oracle.graal.python.nodes.attributes;
 
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.PDict;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.PMappingproxy;
+
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.str.PString;
@@ -68,9 +70,9 @@ protected static boolean isDictUnsetOrSameAsStorage(PythonObject object) {
         return object.getDict() == null;
     }
 
-    protected static boolean hasBuiltinDict(PythonObject object, IsBuiltinClassProfile profile) {
+    protected static boolean hasBuiltinDict(PythonObject object, IsBuiltinClassProfile profileDict, IsBuiltinClassProfile profileMapping) {
         PHashingCollection dict = object.getDict();
-        return dict != null && profile.profileObject(object.getDict(), PythonBuiltinClassType.PDict);
+        return dict != null && (profileDict.profileObject(dict, PDict) || profileMapping.profileObject(dict, PMappingproxy));
     }
 
     protected static Location getLocationOrNull(Property prop) {

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

@@ -100,43 +100,43 @@ protected Object readFromDynamicStorage(PythonObject object, Object key,
         return readAttributeFromDynamicObjectNode.execute(object.getStorage(), key);
     }
 
+    private static Object readDirectlyFromBuiltinDict(PHashingCollection dict, String key,
+                    HashingCollectionNodes.GetDictStorageNode getDictStorage,
+                    HashingStorageNodes.GetItemNode getItemNode) {
+        // note that we don't need to pass the state here - string keys are hashable by definition
+        Object value = getItemNode.execute(null, getDictStorage.execute(dict), key);
+        if (value == null) {
+            return PNone.NO_VALUE;
+        } else {
+            return value;
+        }
+    }
+
     // special case for the very common module attribute read
     @Specialization(guards = {
                     "cachedObject == object",
                     "cachedObject.getDict() == cachedDict",
-                    "hasBuiltinDict(cachedObject, isBuiltinDict)",
+                    "hasBuiltinDict(cachedObject, isBuiltinDict, isBuiltinMappingproxy)",
     }, assumptions = "singleContextAssumption", limit = "1")
     protected Object readFromBuiltinModuleDict(@SuppressWarnings("unused") PythonModule object, String key,
                     @SuppressWarnings("unused") @Cached("object") PythonModule cachedObject,
                     @SuppressWarnings("unused") @Cached("cachedObject.getDict()") PHashingCollection cachedDict,
                     @SuppressWarnings("unused") @Cached("singleContextAssumption()") Assumption singleContextAssumption,
                     @Cached HashingCollectionNodes.GetDictStorageNode getDictStorage,
                     @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltinDict,
+                    @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltinMappingproxy,
                     @Cached HashingStorageNodes.GetItemNode getItemNode) {
-        Object value = getItemNode.execute(null, getDictStorage.execute(cachedDict), key);
-        if (value == null) {
-            return PNone.NO_VALUE;
-        } else {
-            return value;
-        }
+        return readDirectlyFromBuiltinDict(cachedDict, key, getDictStorage, getItemNode);
     }
 
     // read from a builtin dict
-    @Specialization(guards = {
-                    "!isHiddenKey(key)",
-                    "hasBuiltinDict(object, isBuiltinDict)",
-    })
+    @Specialization(guards = {"!isHiddenKey(key)", "hasBuiltinDict(object, isBuiltinDict, isBuiltinMappingproxy)"})
     protected Object readFromBuiltinDict(PythonObject object, String key,
                     @Cached HashingCollectionNodes.GetDictStorageNode getDictStorage,
                     @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltinDict,
+                    @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltinMappingproxy,
                     @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {
-        // note that we don't need to pass the state here - string keys are hashable by definition
-        Object value = getItemNode.execute(null, getDictStorage.execute(object.getDict()), key);
-        if (value == null) {
-            return PNone.NO_VALUE;
-        } else {
-            return value;
-        }
+        return readDirectlyFromBuiltinDict(object.getDict(), key, getDictStorage, getItemNode);
     }
 
     // read from the Dict