Use 'IsBuiltinClassProfile' in 'GlobalNode'.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/GlobalNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,20 +44,18 @@
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
-import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
-import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public interface GlobalNode {
     default boolean isInModule(VirtualFrame frame) {
         return PArguments.getGlobals(frame) instanceof PythonModule;
     }
 
-    default boolean isInBuiltinDict(VirtualFrame frame) {
+    default boolean isInBuiltinDict(VirtualFrame frame, IsBuiltinClassProfile profile) {
         Object globals = PArguments.getGlobals(frame);
         if (globals instanceof PDict) {
-            LazyPythonClass clazz = ((PDict) globals).getLazyPythonClass();
-            return clazz == PythonBuiltinClassType.PDict || (clazz instanceof PythonBuiltinClass && ((PythonBuiltinClass) clazz).getType() == PythonBuiltinClassType.PDict);
+            return profile.profileObject((PDict) globals, PythonBuiltinClassType.PDict);
         }
         return false;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadGlobalOrBuiltinNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -80,9 +80,10 @@ protected Object readGlobal(VirtualFrame frame) {
         return returnGlobalOrBuiltin(result);
     }
 
-    @Specialization(guards = "isInBuiltinDict(frame)")
+    @Specialization(guards = "isInBuiltinDict(frame, builtinProfile)")
     protected Object readGlobalDict(VirtualFrame frame,
-                    @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {
+                    @Cached("create()") HashingStorageNodes.GetItemNode getItemNode,
+                    @Cached("create()") @SuppressWarnings("unused") IsBuiltinClassProfile builtinProfile) {
         PythonObject globals = PArguments.getGlobals(frame);
         Object result = getItemNode.execute(((PDict) globals).getDictStorage(), attributeId);
         return returnGlobalOrBuiltin(result == null ? PNone.NO_VALUE : result);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteGlobalNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.nodes.subscript.SetItemNode;
 import com.oracle.truffle.api.dsl.Cached;
@@ -55,6 +56,7 @@
 @NodeChild(value = "rhs", type = ExpressionNode.class)
 public abstract class WriteGlobalNode extends StatementNode implements GlobalNode, WriteNode {
     protected final String attributeId;
+    protected final IsBuiltinClassProfile builtinProfile = IsBuiltinClassProfile.create();
 
     WriteGlobalNode(String attributeId) {
         this.attributeId = attributeId;
@@ -102,31 +104,31 @@ private static PDict getGlobalsDict(VirtualFrame frame) {
         return (PDict) PArguments.getGlobals(frame);
     }
 
-    @Specialization(guards = "isInBuiltinDict(frame)")
+    @Specialization(guards = "isInBuiltinDict(frame, builtinProfile)")
     void writeDictBoolean(VirtualFrame frame, boolean value,
                     @Cached("create()") HashingCollectionNodes.SetItemNode storeNode) {
         storeNode.execute(getGlobalsDict(frame), attributeId, value);
     }
 
-    @Specialization(guards = "isInBuiltinDict(frame)")
+    @Specialization(guards = "isInBuiltinDict(frame, builtinProfile)")
     void writeDictInt(VirtualFrame frame, int value,
                     @Cached("create()") HashingCollectionNodes.SetItemNode storeNode) {
         storeNode.execute(getGlobalsDict(frame), attributeId, value);
     }
 
-    @Specialization(guards = "isInBuiltinDict(frame)")
+    @Specialization(guards = "isInBuiltinDict(frame, builtinProfile)")
     void writeDictLong(VirtualFrame frame, long value,
                     @Cached("create()") HashingCollectionNodes.SetItemNode storeNode) {
         storeNode.execute(getGlobalsDict(frame), attributeId, value);
     }
 
-    @Specialization(guards = "isInBuiltinDict(frame)")
+    @Specialization(guards = "isInBuiltinDict(frame, builtinProfile)")
     void writeDictDouble(VirtualFrame frame, double value,
                     @Cached("create()") HashingCollectionNodes.SetItemNode storeNode) {
         storeNode.execute(getGlobalsDict(frame), attributeId, value);
     }
 
-    @Specialization(replaces = {"writeDictBoolean", "writeDictInt", "writeDictLong", "writeDictDouble"}, guards = "isInBuiltinDict(frame)")
+    @Specialization(replaces = {"writeDictBoolean", "writeDictInt", "writeDictLong", "writeDictDouble"}, guards = "isInBuiltinDict(frame, builtinProfile)")
     void writeDictObject(VirtualFrame frame, Object value,
                     @Cached("create()") HashingCollectionNodes.SetItemNode storeNode) {
         storeNode.execute(getGlobalsDict(frame), attributeId, value);