fix condition for closure caching

timfel · timfel · commit fbc2ad2443d4 · 2019-06-19T09:07:49.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PClosureRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PClosureRootNode.java
@@ -71,7 +71,7 @@ protected void addClosureCellsToLocals(Frame frame) {
             if (singleContextAssumption.isValid() && closure == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 closure = frameClosure;
-            } else if ((!singleContextAssumption.isValid() && closure != null && closure != NO_CLOSURE) || closure != frameClosure) {
+            } else if (closure != NO_CLOSURE && ((!singleContextAssumption.isValid() && closure != null) || closure != frameClosure)) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 closure = NO_CLOSURE;
             }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected void addClosureCellsToLocals(Frame frame) {`
`71`	`71`	`if (singleContextAssumption.isValid() && closure == null) {`
`72`	`72`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`73`	`73`	`closure = frameClosure;`
`74`		`- } else if ((!singleContextAssumption.isValid() && closure != null && closure != NO_CLOSURE) \|\| closure != frameClosure) {`
	`74`	`+ } else if (closure != NO_CLOSURE && ((!singleContextAssumption.isValid() && closure != null) \|\| closure != frameClosure)) {`
`75`	`75`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`76`	`76`	`closure = NO_CLOSURE;`
`77`	`77`	`}`