more usages of lazy classes

lukasstadler · lukasstadler · commit fc2860e29c8e · 2018-10-11T15:00:43.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java
@@ -272,14 +272,9 @@ public final class Python3Core implements PythonCore {
     private final Map<String, PythonModule> builtinModules = new HashMap<>();
     @CompilationFinal private PythonModule builtinsModule;
 
-    @CompilationFinal private PythonBuiltinClass typeClass;
-    @CompilationFinal private PythonBuiltinClass objectClass;
-    @CompilationFinal private PythonBuiltinClass moduleClass;
-    @CompilationFinal private PythonBuiltinClass foreignClass;
     @CompilationFinal private PInt pyTrue;
     @CompilationFinal private PInt pyFalse;
 
-    @CompilationFinal(dimensions = 1) private PythonClass[] errorClasses;
     private final PythonParser parser;
 
     @CompilationFinal private PythonContext singletonContext;
@@ -493,7 +488,7 @@ private void initializeTypes() {
                 createModule(annotation.defineModule());
             }
         }
-        // publish builtin types in the "builtins" module
+        // publish builtin types in the corresponding modules
         for (PythonBuiltinClassType builtinClass : PythonBuiltinClassType.VALUES) {
             String module = builtinClass.getPublicInModule();
             PythonBuiltinClass clazz = lookupType(builtinClass);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java
@@ -441,7 +441,7 @@ String decodeBytes(ByteBuffer bytes, String encoding, String errors) {
                 CharBuffer decoded = charset.newDecoder().onMalformedInput(errorAction).onUnmappableCharacter(errorAction).decode(bytes);
                 return String.valueOf(decoded);
             } catch (IllegalArgumentException e) {
-                throw this.raise(LookupError, "unknown encoding: %s", encoding);
+                throw raise(LookupError, "unknown encoding: %s", encoding);
             } catch (CharacterCodingException e) {
                 throw raise(UnicodeDecodeError, "%s", e.getMessage());
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -50,6 +50,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
@@ -374,7 +375,7 @@ public Object run(String path, PythonModule mod) {
                 } else {
                     file = env.getTruffleFile(path);
                 }
-                Source src = getCore().getLanguage().newSource(ctxt, file, fileName);
+                Source src = getRootNode().getLanguage(PythonLanguage.class).newSource(ctxt, file, fileName);
                 CallTarget callTarget = env.parse(src);
                 callTarget.call(PArguments.withGlobals(mod));
             } catch (PException e) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java
@@ -219,7 +219,7 @@ Object first(@SuppressWarnings("unused") PNone arg) {
          * behavior. (it only captures the frames if a CallTarget boundary is crossed)
          */
         private static final class GetStackTraceRootNode extends RootNode {
-            private ContextReference<PythonContext> contextRef;
+            private final ContextReference<PythonContext> contextRef;
 
             protected GetStackTraceRootNode(PythonLanguage language) {
                 super(language);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -185,7 +185,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Override
     public void initialize(PythonCore core) {
         super.initialize(core);
-        PythonClass errorHandlerClass = core.factory().createPythonClass(core.lookupType(PythonBuiltinClassType.PythonClass), "CErrorHandler",
+        PythonClass errorHandlerClass = core.factory().createPythonClass(PythonBuiltinClassType.PythonClass, "CErrorHandler",
                         new PythonClass[]{core.lookupType(PythonBuiltinClassType.PythonObject)});
         builtinConstants.put("CErrorHandler", errorHandlerClass);
         builtinConstants.put(ERROR_HANDLER, core.factory().createPythonObject(errorHandlerClass));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java
@@ -650,6 +650,7 @@ long doTpFlags(PythonClass object, @SuppressWarnings("unused") String key, long
         }
 
         @Specialization(guards = {"eq(TP_BASICSIZE, key)", "isPythonBuiltinClass(object)"})
+        @TruffleBoundary
         long doTpBasicsize(PythonBuiltinClass object, @SuppressWarnings("unused") String key, long basicsize) {
             // We have to use the 'setAttributeUnsafe' because this properly cannot be modified by
             // the user and we need to initialize it.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java
@@ -157,17 +157,17 @@ public String toString() {
         CompilerAsserts.neverPartOfCompilation();
         if (args == null) {
             if (messageArgs != null && messageArgs.length > 0) {
-                return getPythonClass().getName() + ": " + FORMATTER.format(messageFormat, messageArgs);
+                return getLazyPythonClass().getName() + ": " + FORMATTER.format(messageFormat, messageArgs);
             }
-            return getPythonClass().getName() + ": " + messageFormat;
+            return getLazyPythonClass().getName() + ": " + messageFormat;
         } else if (args.getSequenceStorage().length() == 0) {
-            return getPythonClass().getName();
+            return getLazyPythonClass().getName();
         } else if (args.getSequenceStorage().length() == 1) {
             SequenceStorage store = args.getSequenceStorage();
             Object item = store instanceof BasicSequenceStorage ? store.getItemNormalized(0) : "<unknown>";
-            return getPythonClass().getName() + ": " + item.toString();
+            return getLazyPythonClass().getName() + ": " + item.toString();
         } else {
-            return getPythonClass().getName() + ": " + args.toString();
+            return getLazyPythonClass().getName() + ": " + args.toString();
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java
@@ -91,6 +91,7 @@ abstract static class GetSetNode extends PythonTernaryBuiltinNode {
         private final IsBuiltinClassProfile isNoneBuiltinClassProfile = IsBuiltinClassProfile.create();
         private final ConditionProfile isBuiltinProfile = ConditionProfile.createBinaryProfile();
         private final IsBuiltinClassProfile isBuiltinClassProfile = IsBuiltinClassProfile.create();
+        private final BranchProfile errorBranch = BranchProfile.create();
 
         // https://github.com/python/cpython/blob/e8b19656396381407ad91473af5da8b0d4346e88/Objects/descrobject.c#L70
         protected boolean descr_check(GetSetDescriptor descr, Object obj, PythonClass type) {
@@ -114,7 +115,7 @@ protected boolean descr_check(GetSetDescriptor descr, Object obj, PythonClass ty
                     }
                 }
             }
-
+            errorBranch.enter();
             throw raise(TypeError, "descriptor '%s' for '%s' objects doesn't apply to '%s' object", descr.getName(), descrType.getName(), type.getName());
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/BuiltinMethodBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/BuiltinMethodBuiltins.java
@@ -40,9 +40,11 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.nodes.object.GetLazyClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -84,8 +86,9 @@ String reprBuiltinFunction(PBuiltinMethod self) {
 
         @Specialization(guards = "!isBuiltinFunction(self)")
         @TruffleBoundary
-        Object reprBuiltinMethod(PBuiltinMethod self) {
-            return String.format("<built-in method %s of %s object at 0x%x>", self.getName(), self.getSelf(), self.hashCode());
+        Object reprBuiltinMethod(PBuiltinMethod self,
+                        @Cached("create()") GetLazyClassNode getClassNode) {
+            return String.format("<built-in method %s of %s object at 0x%x>", self.getName(), getClassNode.execute(self.getSelf()).getName(), self.hashCode());
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -175,7 +175,7 @@ public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         String repr(Object self,
-                        @Cached("create()") GetLazyClassNode getClass,
+                        @Cached("create()") GetClassNode getClass,
                         @Cached("create()") ReadAttributeFromObjectNode readModuleNode,
                         @Cached("create()") ReadAttributeFromObjectNode readQualNameNode) {
             if (self == PNone.NONE) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java
@@ -149,7 +149,7 @@ public int compareTo(Object o) {
      */
     @Override
     public String toString() {
-        return "<" + getPythonClass().getName() + " object at 0x" + Integer.toHexString(hashCode()) + ">";
+        return "<" + getLazyPythonClass().getName() + " object at 0x" + Integer.toHexString(hashCode()) + ">";
     }
 
     /**
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/SetNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/SetNodes.java
@@ -45,7 +45,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes.SetItemNode;
-import com.oracle.graal.python.builtins.objects.type.PythonClass;
+import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -68,15 +68,15 @@ public abstract class SetNodes {
     public abstract static class ConstructSetNode extends PNodeWithContext {
         @Child private SetItemNode setItemNode;
 
-        public abstract PSet execute(Object cls, Object value);
+        public abstract PSet execute(LazyPythonClass cls, Object value);
 
         public final PSet executeWith(Object value) {
-            return this.execute(lookupClass(PythonBuiltinClassType.PSet), value);
+            return this.execute(PythonBuiltinClassType.PSet, value);
         }
 
         @Specialization
         @TruffleBoundary
-        public PSet setString(PythonClass cls, String arg) {
+        public PSet setString(LazyPythonClass cls, String arg) {
             PSet set = factory().createSet(cls);
             for (int i = 0; i < arg.length(); i++) {
                 getSetItemNode().execute(set, String.valueOf(arg.charAt(i)), PNone.NO_VALUE);
@@ -86,12 +86,12 @@ public PSet setString(PythonClass cls, String arg) {
 
         @Specialization(guards = "emptyArguments(none)")
         @SuppressWarnings("unused")
-        public PSet set(PythonClass cls, PNone none) {
+        public PSet set(LazyPythonClass cls, PNone none) {
             return factory().createSet();
         }
 
         @Specialization(guards = "!isNoValue(iterable)")
-        public PSet setIterable(PythonClass cls, Object iterable,
+        public PSet setIterable(LazyPythonClass cls, Object iterable,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") GetNextNode next,
                         @Cached("create()") IsBuiltinClassProfile errorProfile) {
@@ -109,7 +109,7 @@ public PSet setIterable(PythonClass cls, Object iterable,
         }
 
         @Fallback
-        public PSet setObject(@SuppressWarnings("unused") Object cls, Object value) {
+        public PSet setObject(@SuppressWarnings("unused") LazyPythonClass cls, Object value) {
             throw raise(TypeError, "'%p' object is not iterable", value);
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java
@@ -40,7 +40,6 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassNativeWrapper;
-import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -250,10 +249,6 @@ PythonClass[] mergeMROs(MROMergeState[] toMerge, List<PythonClass> mro) {
         return mro.toArray(new PythonClass[mro.size()]);
     }
 
-    public void addMethod(PFunction method) {
-        setAttribute(method.getName(), method);
-    }
-
     @Override
     @TruffleBoundary
     public void setAttribute(Object key, Object value) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java
@@ -94,10 +94,6 @@ public final PException raiseIndexError() {
         return raise(PythonErrorType.IndexError, "cannot fit 'int' into an index-sized integer");
     }
 
-    public final PythonClass lookupClass(PythonBuiltinClassType type) {
-        return getCore().lookupType(type);
-    }
-
     public final PythonClass getPythonClass(LazyPythonClass lazyClass, ConditionProfile profile) {
         if (profile.profile(lazyClass instanceof PythonClass)) {
             return (PythonClass) lazyClass;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/TupleNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/TupleNodes.java
@@ -47,7 +47,6 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
-import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -80,18 +79,18 @@ protected LazyPythonClass getClass(Object value) {
         }
 
         public final PTuple execute(Object value) {
-            return execute(lookupClass(PythonBuiltinClassType.PTuple), value);
+            return execute(PythonBuiltinClassType.PTuple, value);
         }
 
-        public abstract PTuple execute(Object cls, Object value);
+        public abstract PTuple execute(LazyPythonClass cls, Object value);
 
         @Specialization(guards = "isNoValue(none)")
-        public PTuple tuple(PythonClass cls, @SuppressWarnings("unused") PNone none) {
+        public PTuple tuple(LazyPythonClass cls, @SuppressWarnings("unused") PNone none) {
             return factory().createEmptyTuple(cls);
         }
 
         @Specialization
-        public PTuple tuple(PythonClass cls, String arg) {
+        public PTuple tuple(LazyPythonClass cls, String arg) {
             Object[] values = new Object[arg.length()];
             for (int i = 0; i < arg.length(); i++) {
                 values[i] = String.valueOf(arg.charAt(i));
@@ -100,12 +99,12 @@ public PTuple tuple(PythonClass cls, String arg) {
         }
 
         @Specialization(guards = {"cannotBeOverridden(cls)", "cannotBeOverridden(getClass(iterable))"})
-        public PTuple tuple(@SuppressWarnings("unused") PythonClass cls, PTuple iterable) {
+        public PTuple tuple(@SuppressWarnings("unused") LazyPythonClass cls, PTuple iterable) {
             return iterable;
         }
 
         @Specialization(guards = {"!isNoValue(iterable)", "createNewTuple(cls, iterable)"})
-        public PTuple tuple(PythonClass cls, Object iterable,
+        public PTuple tuple(LazyPythonClass cls, Object iterable,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") GetNextNode next,
                         @Cached("create()") IsBuiltinClassProfile errorProfile) {
@@ -123,12 +122,12 @@ public PTuple tuple(PythonClass cls, Object iterable,
         }
 
         @Fallback
-        public PTuple tuple(@SuppressWarnings("unused") Object cls, Object value) {
+        public PTuple tuple(@SuppressWarnings("unused") LazyPythonClass cls, Object value) {
             CompilerDirectives.transferToInterpreter();
             throw new RuntimeException("list does not support iterable object " + value);
         }
 
-        protected boolean createNewTuple(PythonClass cls, Object iterable) {
+        protected boolean createNewTuple(LazyPythonClass cls, Object iterable) {
             if (iterable instanceof PTuple) {
                 return !(PGuards.cannotBeOverridden(cls) && PGuards.cannotBeOverridden(getClass(iterable)));
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/CastToListNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/CastToListNode.java
@@ -120,7 +120,7 @@ protected GetAttributeNode getList() {
     @Specialization(rewriteOn = PException.class)
     protected PList starredIterable(PythonObject value,
                     @Cached("create()") ConstructListNode constructListNode) {
-        return constructListNode.execute(lookupClass(PythonBuiltinClassType.PList), value);
+        return constructListNode.execute(PythonBuiltinClassType.PList, value);
     }
 
     @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetLazyClassNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetLazyClassNode.java
@@ -92,68 +92,68 @@ public final LazyPythonClass execute(Object object) {
     protected abstract LazyPythonClass executeGetClass(Object object);
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") GetSetDescriptor object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") GetSetDescriptor object) {
         return PythonBuiltinClassType.GetSetDescriptor;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") PNone object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") PNone object) {
         return PythonBuiltinClassType.PNone;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") PNotImplemented object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") PNotImplemented object) {
         return PythonBuiltinClassType.PNotImplemented;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") PEllipsis object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") PEllipsis object) {
         return PythonBuiltinClassType.PEllipsis;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") boolean object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") boolean object) {
         return PythonBuiltinClassType.Boolean;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") int object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") int object) {
         return PythonBuiltinClassType.PInt;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") long object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") long object) {
         return PythonBuiltinClassType.PInt;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") double object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") double object) {
         return PythonBuiltinClassType.PFloat;
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") String object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") String object) {
         return PythonBuiltinClassType.PString;
     }
 
     @Specialization
-    protected PythonClass getIt(PythonNativeObject object,
+    protected static PythonClass getIt(PythonNativeObject object,
                     @Cached("create()") GetNativeClassNode getNativeClassNode) {
         return getNativeClassNode.execute(object);
     }
 
     @Specialization
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") PythonNativeVoidPtr object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") PythonNativeVoidPtr object) {
         return PythonBuiltinClassType.PInt;
     }
 
     @Specialization
-    protected LazyPythonClass getPythonClassGeneric(PythonObject object) {
+    protected static LazyPythonClass getPythonClassGeneric(PythonObject object) {
         return object.getLazyPythonClass();
     }
 
     @Specialization(guards = "isForeignObject(object)")
-    protected LazyPythonClass getIt(@SuppressWarnings("unused") TruffleObject object) {
+    protected static LazyPythonClass getIt(@SuppressWarnings("unused") TruffleObject object) {
         return PythonBuiltinClassType.TruffleObject;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/IsBuiltinClassProfile.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/IsBuiltinClassProfile.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FloatFormatter.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FloatFormatter.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/IntegerFormatter.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/IntegerFormatter.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/InternalFormat.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/InternalFormat.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ String decodeBytes(ByteBuffer bytes, String encoding, String errors) {`
`441`	`441`	`CharBuffer decoded = charset.newDecoder().onMalformedInput(errorAction).onUnmappableCharacter(errorAction).decode(bytes);`
`442`	`442`	`return String.valueOf(decoded);`
`443`	`443`	`} catch (IllegalArgumentException e) {`
`444`		`- throw this.raise(LookupError, "unknown encoding: %s", encoding);`
	`444`	`+ throw raise(LookupError, "unknown encoding: %s", encoding);`
`445`	`445`	`} catch (CharacterCodingException e) {`
`446`	`446`	`throw raise(UnicodeDecodeError, "%s", e.getMessage());`
`447`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -650,6 +650,7 @@ long doTpFlags(PythonClass object, @SuppressWarnings("unused") String key, long`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`@Specialization(guards = {"eq(TP_BASICSIZE, key)", "isPythonBuiltinClass(object)"})`
	`653`	`+ @TruffleBoundary`
`653`	`654`	`long doTpBasicsize(PythonBuiltinClass object, @SuppressWarnings("unused") String key, long basicsize) {`
`654`	`655`	`// We have to use the 'setAttributeUnsafe' because this properly cannot be modified by`
`655`	`656`	`// the user and we need to initialize it.`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ abstract static class GetSetNode extends PythonTernaryBuiltinNode {`
`91`	`91`	`private final IsBuiltinClassProfile isNoneBuiltinClassProfile = IsBuiltinClassProfile.create();`
`92`	`92`	`private final ConditionProfile isBuiltinProfile = ConditionProfile.createBinaryProfile();`
`93`	`93`	`private final IsBuiltinClassProfile isBuiltinClassProfile = IsBuiltinClassProfile.create();`
	`94`	`+ private final BranchProfile errorBranch = BranchProfile.create();`
`94`	`95`
`95`	`96`	`// https://github.com/python/cpython/blob/e8b19656396381407ad91473af5da8b0d4346e88/Objects/descrobject.c#L70`
`96`	`97`	`protected boolean descr_check(GetSetDescriptor descr, Object obj, PythonClass type) {`
`@@ -114,7 +115,7 @@ protected boolean descr_check(GetSetDescriptor descr, Object obj, PythonClass ty`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`	`}`
`117`		`-`
	`118`	`+ errorBranch.enter();`
`118`	`119`	`throw raise(TypeError, "descriptor '%s' for '%s' objects doesn't apply to '%s' object", descr.getName(), descrType.getName(), type.getName());`
`119`	`120`	`}`
`120`	`121`	`}`