don't leak NO_VALUE into Python space

timfel · timfel · commit e9096b7783fb · 2018-12-12T11:16:40.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/AbstractMethodBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/AbstractMethodBuiltins.java
@@ -195,7 +195,11 @@ private Object readFromFunc(Object func) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 readFunc = insert(ReadAttributeFromObjectNode.create());
             }
-            return readFunc.execute(func, __DOC__);
+            Object doc = readFunc.execute(func, __DOC__);
+            if (doc == PNone.NO_VALUE) {
+                doc = PNone.NONE;
+            }
+            return doc;
         }
 
         @Specialization(guards = "isNoValue(none)")

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,11 @@ private Object readFromFunc(Object func) {`
`195`	`195`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`196`	`196`	`readFunc = insert(ReadAttributeFromObjectNode.create());`
`197`	`197`	`}`
`198`		`- return readFunc.execute(func, __DOC__);`
	`198`	`+ Object doc = readFunc.execute(func, __DOC__);`
	`199`	`+ if (doc == PNone.NO_VALUE) {`
	`200`	`+ doc = PNone.NONE;`
	`201`	`+ }`
	`202`	`+ return doc;`
`199`	`203`	`}`
`200`	`204`
`201`	`205`	`@Specialization(guards = "isNoValue(none)")`