Make ReadSlotByNameNode into inlined node

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyMappingMethodsWrapper.java

@@ -45,13 +45,15 @@
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
 /**
@@ -88,11 +90,12 @@ protected Object getMembers(@SuppressWarnings("unused") boolean includeInternal)
 
     @ExportMessage
     protected Object readMember(String member,
+                    @Bind("$node") Node inliningTarget,
                     @Cached ReadSlotByNameNode readSlotByNameNode,
                     @Exclusive @Cached GilNode gil) throws UnknownIdentifierException {
         boolean mustRelease = gil.acquire();
         try {
-            Object result = readSlotByNameNode.execute(this, member, SLOTS);
+            Object result = readSlotByNameNode.execute(inliningTarget, this, member, SLOTS);
             if (result == null) {
                 throw UnknownIdentifierException.create(member);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyNumberMethodsWrapper.java

@@ -79,6 +79,7 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -87,6 +88,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
 /**
@@ -161,11 +163,12 @@ protected Object getMembers(@SuppressWarnings("unused") boolean includeInternal)
 
     @ExportMessage
     protected Object readMember(String member,
+                    @Bind("$node") Node inliningTarget,
                     @Cached ReadSlotByNameNode readSlotByNameNode,
                     @Exclusive @Cached GilNode gil) throws UnknownIdentifierException {
         boolean mustRelease = gil.acquire();
         try {
-            Object result = readSlotByNameNode.execute(this, member, SLOTS);
+            Object result = readSlotByNameNode.execute(inliningTarget, this, member, SLOTS);
             if (result == null) {
                 throw UnknownIdentifierException.create(member);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PySequenceMethodsWrapper.java

@@ -50,6 +50,7 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -58,6 +59,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
 /**
@@ -95,11 +97,12 @@ protected Object getMembers(@SuppressWarnings("unused") boolean includeInternal)
 
     @ExportMessage
     protected Object readMember(String member,
+                    @Bind("$node") Node inliningTarget,
                     @Cached ReadSlotByNameNode readSlotByNameNode,
                     @Exclusive @Cached GilNode gil) throws UnknownIdentifierException {
         boolean mustRelease = gil.acquire();
         try {
-            Object result = readSlotByNameNode.execute(this, member, SLOTS);
+            Object result = readSlotByNameNode.execute(inliningTarget, this, member, SLOTS);
             if (result == null) {
                 throw UnknownIdentifierException.create(member);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ReadSlotByNameNode.java

@@ -42,14 +42,18 @@
 
 import com.oracle.graal.python.nodes.attributes.LookupNativeSlotNode;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 
 @GenerateUncached
+@GenerateCached(false)
+@GenerateInline
 public abstract class ReadSlotByNameNode extends Node {
-    public abstract Object execute(PythonNativeWrapper wrapper, String member, SlotMethodDef[] slots);
+    public abstract Object execute(Node inliningTarget, PythonNativeWrapper wrapper, String member, SlotMethodDef[] slots);
 
     @Specialization(guards = {"cachedMember.equals(member)", "slot != null"})
     Object cachedMember(PythonNativeWrapper wrapper, @SuppressWarnings("unused") String member, @SuppressWarnings("unused") SlotMethodDef[] slots,