writing to a cell in a class scope should still write the value to the namespace also

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/ReadClassAttributeNode.java

@@ -47,6 +47,7 @@
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.ReadLocalNode;
 import com.oracle.graal.python.nodes.frame.ReadNode;
+import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.nodes.subscript.GetItemNode;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -94,14 +95,12 @@ public StatementNode makeDeleteNode() {
 
     @Override
     public StatementNode makeWriteNode(ExpressionNode rhs) {
-        ExpressionNode right = rhs;
         // freevars pass through the special Class scope
         if (readCellLocal != null && !isFreeVar) {
-            // TODO (tfel): Is this what's intended?
-            return ((ReadNode) readCellLocal).makeWriteNode(rhs);
+            return new WriteClassAttributeCellNode((ReadNode) readCellLocal, (ReadNode) getNsItem, rhs);
         } else {
             // assignments always got to the innermost scope
-            return ((ReadNode) getNsItem).makeWriteNode(right);
+            return ((ReadNode) getNsItem).makeWriteNode(rhs);
         }
     }
 
@@ -132,4 +131,31 @@ Object read(VirtualFrame frame,
             return readGlobal.execute(frame);
         }
     }
+
+    private static class WriteClassAttributeCellNode extends StatementNode implements WriteNode {
+        @Child private WriteNode writeCellLocal;
+        @Child private WriteNode writeNsItem;
+        @Child private ExpressionNode right;
+
+        WriteClassAttributeCellNode(ReadNode readCellLocal, ReadNode getNsItem, ExpressionNode rhs) {
+            writeCellLocal = (WriteNode) readCellLocal.makeWriteNode(null);
+            writeNsItem = (WriteNode) getNsItem.makeWriteNode(null);
+            right = rhs;
+        }
+
+        public ExpressionNode getRhs() {
+            return right;
+        }
+
+        public void doWrite(VirtualFrame frame, Object value) {
+            writeCellLocal.doWrite(frame, value);
+            writeNsItem.doWrite(frame, value);
+        }
+
+        @Override
+        public void executeVoid(VirtualFrame frame) {
+            Object value = right.execute(frame);
+            doWrite(frame, value);
+        }
+    }
 }