[GR-35198] Fix PNode#getScope to work with null frame

timfel · timfel · commit 4025521011a6 · 2021-11-22T19:21:28.000Z
PullRequest: graalpython/2037
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNode.java
@@ -93,7 +93,7 @@ final boolean hasScope(@SuppressWarnings("unused") Frame frame) {
     @ExportMessage
     final Object getScope(Frame frame, @SuppressWarnings("unused") boolean nodeEnter) throws UnsupportedMessageException {
         if (hasScope(frame)) {
-            return PythonScopes.create(this, frame.materialize());
+            return PythonScopes.create(this, frame != null ? frame.materialize() : null);
         } else {
             throw UnsupportedMessageException.create();
         }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ final boolean hasScope(@SuppressWarnings("unused") Frame frame) {`
`93`	`93`	`@ExportMessage`
`94`	`94`	`final Object getScope(Frame frame, @SuppressWarnings("unused") boolean nodeEnter) throws UnsupportedMessageException {`
`95`	`95`	`if (hasScope(frame)) {`
`96`		`- return PythonScopes.create(this, frame.materialize());`
	`96`	`+ return PythonScopes.create(this, frame != null ? frame.materialize() : null);`
`97`	`97`	`} else {`
`98`	`98`	`throw UnsupportedMessageException.create();`
`99`	`99`	`}`