fix merge

Author: timfel

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

@@ -508,7 +508,7 @@ private Object getLongItem(PDict nativeMembers, String key) {
 
     // roughly equivalent to _Py_CheckFunctionResult in Objects/call.c
     @ImportStatic(PGuards.class)
-    abstract static class CheckFunctionResultNode extends PBaseNode {
+    abstract static class CheckFunctionResultNode extends PNodeWithContext {
 
         @Child private Node isNullNode;
 

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

@@ -978,7 +978,7 @@ public static PAsPointerNode create() {
         }
     }
 
-    abstract static class PToNativeNode extends PBaseNode {
+    abstract static class PToNativeNode extends PNodeWithContext {
         @Child private ToPyObjectNode toPyObjectNode;
         @Child private MaterializeDelegateNode materializeNode;
         @Child private PIsPointerNode pIsPointerNode = PIsPointerNode.create();