make PythonBufferAccessLibrary more generic

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/buffer/PythonBufferAccessLibrary.java

@@ -45,7 +45,6 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
 import com.oracle.graal.python.nodes.IndirectCallNode;
-import com.oracle.graal.python.nodes.PNodeWithRaiseAndIndirectCall;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.util.PythonUtils;
@@ -55,6 +54,7 @@
 import com.oracle.truffle.api.library.GenerateLibrary.Abstract;
 import com.oracle.truffle.api.library.Library;
 import com.oracle.truffle.api.library.LibraryFactory;
+import com.oracle.truffle.api.nodes.Node;
 
 /**
  * A library for accessing buffers obtained using {@link PythonBufferAcquireLibrary}. The buffer
@@ -101,7 +101,7 @@ public static void assertIsBuffer(Object receiver) {
     /**
      * Release the buffer. Equivalent of CPython's {@code PyBuffer_Release}, but must not be called
      * multiple times on the same buffer. If the caller has access to a VirtualFrame
-     * {@link #release(Object, VirtualFrame, PNodeWithRaiseAndIndirectCall)} or
+     * {@link #release(Object, VirtualFrame, PNodeWithIndirectCall)} or
      * {@link #release(Object, VirtualFrame, PythonContext, PythonLanguage, IndirectCallNode)}
      * should be used. If the caller doesn't have access to a VirtualFrame it must be ensured that
      * an IndirectCallContext was already created in the call path.
@@ -113,7 +113,7 @@ public void release(@SuppressWarnings("unused") Object receiver) {
      * Release the buffer. Equivalent of CPython's {@code PyBuffer_Release}, but must not be called
      * multiple times on the same buffer.
      */
-    public final void release(Object receiver, VirtualFrame frame, PNodeWithRaiseAndIndirectCall callNode) {
+    public final <T extends Node & IndirectCallNode> void release(Object receiver, VirtualFrame frame, T callNode) {
         Object savedState = IndirectCallContext.enter(frame, callNode);
         try {
             release(receiver);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ExecutionContext.java

@@ -46,7 +46,6 @@
 import com.oracle.graal.python.builtins.objects.frame.PFrame.Reference;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.nodes.IndirectCallNode;
-import com.oracle.graal.python.nodes.PNodeWithRaiseAndIndirectCall;
 import com.oracle.graal.python.nodes.PRootNode;
 import com.oracle.graal.python.nodes.control.TopLevelExceptionHandler;
 import com.oracle.graal.python.nodes.frame.MaterializeFrameNode;
@@ -355,7 +354,7 @@ public static Object enter(VirtualFrame frame, PythonLanguage language, PythonCo
             return enter(frame, pythonThreadState, needsCallerFrame, needsExceptionState, callNode);
         }
 
-        public static Object enter(VirtualFrame frame, PNodeWithRaiseAndIndirectCall indirectCallNode) {
+        public static <T extends Node & IndirectCallNode> Object enter(VirtualFrame frame, T indirectCallNode) {
             if (frame == null || indirectCallNode == null) {
                 return null;
             }
@@ -365,7 +364,7 @@ public static Object enter(VirtualFrame frame, PNodeWithRaiseAndIndirectCall ind
                 return null;
             }
 
-            PythonThreadState pythonThreadState = indirectCallNode.getContext().getThreadState(indirectCallNode.getLanguage());
+            PythonThreadState pythonThreadState = PythonContext.get(indirectCallNode).getThreadState(PythonLanguage.get(indirectCallNode));
             return enter(frame, pythonThreadState, needsCallerFrame, needsExceptionState, indirectCallNode);
         }
 
@@ -414,11 +413,11 @@ public static void exit(VirtualFrame frame, PythonLanguage language, PythonConte
             assert savedState == null : "tried to exit an indirect call with state, but without frame/context";
         }
 
-        public static void exit(VirtualFrame frame, PNodeWithRaiseAndIndirectCall indirectCallNode, Object savedState) {
+        public static <T extends Node & IndirectCallNode> void exit(VirtualFrame frame, T indirectCallNode, Object savedState) {
             if (savedState != null && frame != null) {
-                PythonContext context = indirectCallNode.getContext();
+                PythonContext context = PythonContext.get(indirectCallNode);
                 if (context != null) {
-                    PythonLanguage language = indirectCallNode.getLanguage();
+                    PythonLanguage language = PythonLanguage.get(indirectCallNode);
                     exit(frame, context.getThreadState(language), savedState);
                     return;
                 }