implement co_constants

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -61,6 +61,7 @@
 import com.oracle.graal.python.nodes.frame.WriteGlobalNode;
 import com.oracle.graal.python.nodes.function.FunctionRootNode;
 import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
+import com.oracle.graal.python.nodes.literal.SimpleLiteralNode;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
@@ -251,6 +252,11 @@ private static Object[] extractVarnames(RootNode rootNode, String[] parameterIds
         return varNameList.toArray();
     }
 
+    @TruffleBoundary
+    private static Object[] extractConstants(RootNode rootNode) {
+        return NodeUtil.findAllNodeInstances(rootNode, SimpleLiteralNode.class).stream().map((n) -> n.getValue()).toArray();
+    }
+
     @TruffleBoundary
     private static Object[] extractGlobalAndBuiltinVarnames(RootNode rootNode) {
         RootNode funcRootNode = (rootNode instanceof GeneratorFunctionRootNode) ? ((GeneratorFunctionRootNode) rootNode).getFunctionRootNode() : rootNode;
@@ -407,6 +413,9 @@ public Object[] getGlobalAndBuiltinVarNames() {
     }
 
     public Object[] getConstants() {
+        if (constants == null) {
+            constants = extractConstants(getRootNode());
+        }
         return constants;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/BooleanLiteralNode.java

@@ -27,7 +27,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class BooleanLiteralNode extends LiteralNode {
+public final class BooleanLiteralNode extends SimpleLiteralNode {
 
     private final boolean value;
 
@@ -44,4 +44,9 @@ public boolean executeBoolean(VirtualFrame frame) {
     public Object execute(VirtualFrame frame) {
         return value;
     }
+
+    @Override
+    public Object getValue() {
+        return value;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/BytesLiteralNode.java

@@ -31,7 +31,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class BytesLiteralNode extends LiteralNode {
+public final class BytesLiteralNode extends SimpleLiteralNode {
     @Child private PythonObjectFactory factory = PythonObjectFactory.create();
     @CompilationFinal(dimensions = 1) private final byte[] value;
 
@@ -41,6 +41,11 @@ public BytesLiteralNode(byte[] value) {
 
     @Override
     public Object execute(VirtualFrame frame) {
+        return getValue();
+    }
+
+    @Override
+    public Object getValue() {
         return factory.createBytes(Arrays.copyOf(value, value.length));
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/ComplexLiteralNode.java

@@ -28,13 +28,14 @@
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class ComplexLiteralNode extends LiteralNode {
+public final class ComplexLiteralNode extends SimpleLiteralNode {
     private final PComplex value;
 
     public ComplexLiteralNode(PComplex value) {
         this.value = value;
     }
 
+    @Override
     public PComplex getValue() {
         return value;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/DoubleLiteralNode.java

@@ -27,7 +27,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class DoubleLiteralNode extends LiteralNode {
+public final class DoubleLiteralNode extends SimpleLiteralNode {
 
     private final double value;
 
@@ -44,4 +44,9 @@ public double executeDouble(VirtualFrame frame) {
     public Object execute(VirtualFrame frame) {
         return value;
     }
+
+    @Override
+    public Object getValue() {
+        return value;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/IntegerLiteralNode.java

@@ -27,7 +27,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class IntegerLiteralNode extends LiteralNode {
+public final class IntegerLiteralNode extends SimpleLiteralNode {
 
     private final int value;
 
@@ -45,8 +45,8 @@ public Object execute(VirtualFrame frame) {
         return value;
     }
 
-    public int getValue() {
+    @Override
+    public Integer getValue() {
         return value;
     }
-
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/LongLiteralNode.java

@@ -27,7 +27,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class LongLiteralNode extends LiteralNode {
+public final class LongLiteralNode extends SimpleLiteralNode {
 
     private final long value;
 
@@ -45,7 +45,8 @@ public Object execute(VirtualFrame frame) {
         return value;
     }
 
-    public long getValue() {
+    @Override
+    public Long getValue() {
         return value;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/PIntLiteralNode.java

@@ -31,13 +31,14 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class PIntLiteralNode extends LiteralNode {
+public final class PIntLiteralNode extends SimpleLiteralNode {
     private final PInt value;
 
     public PIntLiteralNode(BigInteger value) {
         this.value = PythonObjectFactory.getUncached().createInt(value);
     }
 
+    @Override
     public PInt getValue() {
         return value;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/SimpleLiteralNode.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2013, Regents of the University of California
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.oracle.graal.python.nodes.literal;
+
+public abstract class SimpleLiteralNode extends LiteralNode {
+    public abstract Object getValue();
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/StringLiteralNode.java

@@ -27,7 +27,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class StringLiteralNode extends LiteralNode {
+public final class StringLiteralNode extends SimpleLiteralNode {
 
     private final String value;
 
@@ -40,6 +40,7 @@ public Object execute(VirtualFrame frame) {
         return value;
     }
 
+    @Override
     public String getValue() {
         return value;
     }