Fix: ternary wrapper needs to pass None instead of NULL

fangerer · fangerer · commit cfd64d36b8df · 2020-10-02T19:09:00.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java
@@ -528,7 +528,8 @@ private Object getArg2(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 readArg2Node = insert(ReadIndexedArgumentNode.create(2));
             }
-            return readArg2Node.execute(frame);
+            Object arg2 = readArg2Node.execute(frame);
+            return arg2 != PNone.NO_VALUE ? arg2 : PNone.NONE;
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,8 @@ private Object getArg2(VirtualFrame frame) {`
`528`	`528`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`529`	`529`	`readArg2Node = insert(ReadIndexedArgumentNode.create(2));`
`530`	`530`	`}`
`531`		`- return readArg2Node.execute(frame);`
	`531`	`+ Object arg2 = readArg2Node.execute(frame);`
	`532`	`+ return arg2 != PNone.NO_VALUE ? arg2 : PNone.NONE;`
`532`	`533`	`}`
`533`	`534`
`534`	`535`	`@Override`