Avoid repeated PythonLanguage lookup in PythonObjectSlowPathFactory

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -798,7 +798,7 @@ public final boolean isCoreInitialized() {
      * Load the core library and prepare all builtin classes and modules.
      */
     public final void initialize(PythonContext context) {
-        objectFactory = new PythonObjectSlowPathFactory(context.getAllocationReporter());
+        objectFactory = new PythonObjectSlowPathFactory(context.getAllocationReporter(), context.getLanguage());
         initializeJavaCore();
         initializePython3Core(context.getCoreHomeOrFail());
         assert SpecialMethodSlot.checkSlotOverrides(this);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -281,12 +281,12 @@ protected AllocationReporter getAllocationReporter() {
         return PythonContext.get(this).getAllocationReporter();
     }
 
-    public final PythonLanguage getLanguage() {
+    public PythonLanguage getLanguage() {
         return PythonLanguage.get(this);
     }
 
     public final Shape getShape(PythonBuiltinClassType cls) {
-        return cls.getInstanceShape(PythonLanguage.get(this));
+        return cls.getInstanceShape(getLanguage());
     }
 
     public final Shape getShape(Object cls) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectSlowPathFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -42,7 +42,7 @@
 
 import java.util.Objects;
 
-import com.oracle.graal.python.builtins.objects.type.TypeNodesFactory.GetInstanceShapeNodeGen;
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.instrumentation.AllocationReporter;
@@ -63,9 +63,18 @@
 public final class PythonObjectSlowPathFactory extends PythonObjectFactory {
 
     private final AllocationReporter reporter;
+    private final PythonLanguage language;
+    private final SlowPathGetInstanceShapeNode getInstanceShapeNode;
 
-    public PythonObjectSlowPathFactory(AllocationReporter reporter) {
+    public PythonObjectSlowPathFactory(AllocationReporter reporter, PythonLanguage language) {
         this.reporter = Objects.requireNonNull(reporter);
+        this.language = language;
+        this.getInstanceShapeNode = new SlowPathGetInstanceShapeNode(language);
+    }
+
+    @Override
+    public PythonLanguage getLanguage() {
+        return language;
     }
 
     @TruffleBoundary
@@ -78,7 +87,7 @@ protected AllocationReporter executeTrace(Object arg0Value, long arg1Value) {
     @TruffleBoundary
     @Override
     protected Shape executeGetShape(Object arg0Value, boolean arg1Value) {
-        return PythonObjectFactory.getShape(arg0Value, arg1Value, (GetInstanceShapeNodeGen.getUncached()));
+        return PythonObjectFactory.getShape(arg0Value, arg1Value, getInstanceShapeNode);
     }
 
     @Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/SlowPathGetInstanceShapeNode.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022, 2022, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.runtime.object;
+
+import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes;
+import com.oracle.graal.python.builtins.objects.type.TypeNodesFactory;
+import com.oracle.truffle.api.object.Shape;
+
+final class SlowPathGetInstanceShapeNode extends TypeNodes.GetInstanceShape {
+    private final PythonLanguage language;
+
+    SlowPathGetInstanceShapeNode(PythonLanguage language) {
+        this.language = language;
+    }
+
+    @Override
+    public Shape execute(Object clazz) {
+        if (clazz instanceof PythonBuiltinClassType) {
+            // fast-path for PBCT which avoids the language lookup
+            return ((PythonBuiltinClassType) clazz).getInstanceShape(language);
+        }
+        return TypeNodesFactory.GetInstanceShapeNodeGen.getUncached().execute(clazz);
+    }
+}