Address review feedback

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java

@@ -73,7 +73,7 @@ public abstract static class LookupTextEncoding extends PNodeWithRaise {
         @Specialization
         Object lookup(VirtualFrame frame, String encoding, String alternateCommand,
                         @Cached PyObjectCallMethodObjArgs callMethod) {
-            PythonModule codecs = PythonContext.get(this).getCore().lookupBuiltinModule("_codecs_truffle");
+            PythonModule codecs = getContext().getCore().lookupBuiltinModule("_codecs_truffle");
             return callMethod.execute(frame, codecs, "_lookup_text_encoding", encoding, alternateCommand);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -2189,7 +2189,7 @@ Object doPTuple(Object tuple, @SuppressWarnings("unused") Object key) {
     @GenerateNodeFactory
     abstract static class PySequence_Check extends PythonUnaryBuiltinNode {
         @Specialization
-        boolean check(Object object,
+        static boolean check(Object object,
                         @Cached PySequenceCheckNode check) {
             return check.execute(object);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -838,6 +838,7 @@ public abstract static class CheckCompatibleForAssigmentNode extends PNodeWithCo
         @Child private PRaiseNode raiseNode;
         @Child private GetNameNode getTypeNameNode;
         @Child private ReadAttributeFromObjectNode readAttr;
+        @Child private InstancesOfTypeHaveDictNode instancesHaveDictNode;
 
         public abstract boolean execute(VirtualFrame frame, Object oldBase, Object newBase);
 
@@ -968,6 +969,14 @@ private Object getSlotsFromType(Object type) {
             return slots != PNone.NO_VALUE ? slots : null;
         }
 
+        private boolean instancesHaveDict(Object type) {
+            if (instancesHaveDictNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                instancesHaveDictNode = insert(InstancesOfTypeHaveDictNode.create());
+            }
+            return instancesHaveDictNode.execute(type);
+        }
+
         private GetObjectArrayNode getObjectArrayNode() {
             if (getObjectArrayNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -1017,6 +1026,39 @@ private PRaiseNode getRaiseNode() {
         }
     }
 
+    /**
+     * Equivalent of checking type->tp_dictoffset != 0 in CPython
+     */
+    abstract static class InstancesOfTypeHaveDictNode extends PNodeWithContext {
+        public abstract boolean execute(Object type);
+
+        @Specialization
+        static boolean doPBCT(PythonBuiltinClassType type) {
+            return type.isBuiltinWithDict();
+        }
+
+        @Specialization
+        static boolean doPythonClass(PythonManagedClass type) {
+            return (type.getInstanceShape().getFlags() & PythonObject.HAS_SLOTS_BUT_NO_DICT_FLAG) == 0;
+        }
+
+        @Specialization
+        static boolean doNativeObject(PythonAbstractNativeObject type,
+                        @Cached GetTypeMemberNode getMember,
+                        @Cached CastToJavaIntExactNode cast) {
+            return cast.execute(getMember.execute(type, NativeMember.TP_DICTOFFSET)) != 0;
+        }
+
+        @Fallback
+        static boolean doOther(@SuppressWarnings("unused") Object type) {
+            return true;
+        }
+
+        public static InstancesOfTypeHaveDictNode create() {
+            return TypeNodesFactory.InstancesOfTypeHaveDictNodeGen.create();
+        }
+    }
+
     @TruffleBoundary
     private static boolean compareSortedSlots(Object aSlots, Object bSlots, GetObjectArrayNode getObjectArrayNode) {
         Object[] aArray = getObjectArrayNode.execute(aSlots);
@@ -1644,18 +1686,4 @@ private static long getBuiltinTypeItemsize(PythonBuiltinClassType cls) {
             }
         }
     }
-
-    // Equivalent of checking type->tp_dictoffset != 0 in CPython
-    private static boolean instancesHaveDict(Object type) {
-        if (type instanceof PythonBuiltinClassType) {
-            return ((PythonBuiltinClassType) type).isBuiltinWithDict();
-        }
-        if (type instanceof PythonClass) {
-            return (((PythonClass) type).getInstanceShape().getFlags() & PythonObject.HAS_SLOTS_BUT_NO_DICT_FLAG) == 0;
-        }
-        if (type instanceof PythonAbstractNativeObject) {
-            return CastToJavaIntExactNode.getUncached().execute(GetTypeMemberNode.getUncached().execute(type, NativeMember.TP_DICTOFFSET)) != 0;
-        }
-        return true;
-    }
 }