Do not export cell objects.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/CellSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -27,6 +27,7 @@
 
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.graal.python.nodes.function.FunctionRootNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameSlot;
@@ -36,10 +37,10 @@
 @NodeInfo(shortName = "write_cellvar")
 public abstract class WriteCellVarNode extends StatementNode {
     private int cellIndex = -1;
-    private final CellSupplier cellSupplier;
+    private final FunctionRootNode cellSupplier;
     @Child private ExpressionNode readNode;
 
-    WriteCellVarNode(ExpressionNode readNode, CellSupplier cellSupplier, String identifier) {
+    WriteCellVarNode(ExpressionNode readNode, FunctionRootNode cellSupplier, String identifier) {
         this.readNode = readNode;
         this.cellSupplier = cellSupplier;
 
@@ -53,7 +54,7 @@ public abstract class WriteCellVarNode extends StatementNode {
         }
     }
 
-    public static WriteCellVarNode create(ExpressionNode readNode, CellSupplier cellSupplier, String identifier) {
+    public static WriteCellVarNode create(ExpressionNode readNode, FunctionRootNode cellSupplier, String identifier) {
         return WriteCellVarNodeGen.create(readNode, cellSupplier, identifier);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteCellVarNode.java

@@ -30,7 +30,6 @@
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.nodes.PClosureFunctionRootNode;
-import com.oracle.graal.python.nodes.cell.CellSupplier;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -50,7 +49,7 @@
 /**
  * RootNode of a Python Function body. It is invoked by a CallTarget.
  */
-public class FunctionRootNode extends PClosureFunctionRootNode implements CellSupplier {
+public class FunctionRootNode extends PClosureFunctionRootNode {
     private final ContextReference<PythonContext> contextRef;
     private final PCell[] cells;
     private final ExecutionCellSlots executionCellSlots;
@@ -88,12 +87,10 @@ public String getName() {
         return functionName;
     }
 
-    @Override
     public PCell[] getCells() {
         return cells;
     }
 
-    @Override
     public FrameSlot[] getCellVarSlots() {
         return cellVarSlots;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/FunctionRootNode.java

@@ -383,7 +383,6 @@ graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/p
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallDispatchNode.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/InvokeNode.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/PythonCallNode.java,zippy.copyright
-graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/CellSupplier.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/ReadLocalCellNode.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteCellVarNode.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteLocalCellNode.java,zippy.copyright