Skip to content

Commit 95e3eba

Browse files
committed
GR-20264: create a special graalpython module for graal python specific builtins
1 parent 3f9fa9d commit 95e3eba

File tree

5 files changed

+101
-33
lines changed

5 files changed

+101
-33
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_code.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,5 +173,5 @@ def test_get_globals():
173173
import sys
174174
code = wrapper.__code__
175175
if sys.implementation.name == 'graalpython':
176-
# print(">>> ", code.truffle_co_globals)
177-
assert set(code.truffle_co_globals) == {'a_global'}
176+
from __graalpython__ import current_global_code_variables
177+
assert set(current_global_code_variables(code)) == {'a_global'}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import com.oracle.graal.python.builtins.modules.FcntlModuleBuiltins;
5757
import com.oracle.graal.python.builtins.modules.FunctoolsModuleBuiltins;
5858
import com.oracle.graal.python.builtins.modules.GcModuleBuiltins;
59+
import com.oracle.graal.python.builtins.modules.GraalPythonModuleBuiltins;
5960
import com.oracle.graal.python.builtins.modules.IOModuleBuiltins;
6061
import com.oracle.graal.python.builtins.modules.ImpModuleBuiltins;
6162
import com.oracle.graal.python.builtins.modules.ItertoolsModuleBuiltins;
@@ -371,7 +372,8 @@ private static final PythonBuiltins[] initializeBuiltins() {
371372
new LZMAModuleBuiltins(),
372373
new LZMACompressorBuiltins(),
373374
new LZMADecompressorBuiltins(),
374-
new MultiprocessingModuleBuiltins()));
375+
new MultiprocessingModuleBuiltins(),
376+
new GraalPythonModuleBuiltins()));
375377
if (!TruffleOptions.AOT) {
376378
ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
377379
for (PythonBuiltins builtin : providers) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
/*
2+
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.graal.python.builtins.modules;
42+
43+
import java.util.Arrays;
44+
import java.util.List;
45+
46+
import com.oracle.graal.python.builtins.Builtin;
47+
import com.oracle.graal.python.builtins.CoreFunctions;
48+
import com.oracle.graal.python.builtins.PythonBuiltins;
49+
import com.oracle.graal.python.builtins.modules.BuiltinFunctions.GlobalsNode;
50+
import com.oracle.graal.python.builtins.objects.code.PCode;
51+
import com.oracle.graal.python.nodes.SpecialMethodNames;
52+
import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
53+
import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
54+
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
55+
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
56+
import com.oracle.truffle.api.dsl.Cached;
57+
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
58+
import com.oracle.truffle.api.dsl.ImportStatic;
59+
import com.oracle.truffle.api.dsl.NodeFactory;
60+
import com.oracle.truffle.api.dsl.Specialization;
61+
import com.oracle.truffle.api.frame.VirtualFrame;
62+
63+
@CoreFunctions(defineModule = "__graalpython__")
64+
public class GraalPythonModuleBuiltins extends PythonBuiltins {
65+
@Override
66+
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
67+
return GraalPythonModuleBuiltinsFactory.getFactories();
68+
}
69+
70+
@Builtin(name = "current_global_code_variables", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 1)
71+
@GenerateNodeFactory
72+
@ImportStatic(SpecialMethodNames.class)
73+
abstract static class GetCodeGlobalVarsNode extends PythonUnaryBuiltinNode {
74+
@Specialization
75+
protected Object get(VirtualFrame frame, PCode code,
76+
@Cached GlobalsNode globalsNode,
77+
@Cached("createIfTrueNode()") CastToBooleanNode isTrue,
78+
@Cached("create(__CONTAINS__)") LookupAndCallBinaryNode containsNode) {
79+
Object[] varNames = code.getGlobalAndBuiltinVarNames();
80+
if (varNames != null) {
81+
int i = 0;
82+
Object[] globalNames = new Object[varNames.length];
83+
Object globals = globalsNode.execute(frame);
84+
for (Object name : varNames) {
85+
if (isTrue.executeBoolean(frame, containsNode.executeObject(frame, globals, name))) {
86+
globalNames[i++] = name;
87+
}
88+
}
89+
return factory().createTuple(Arrays.copyOf(globalNames, i));
90+
}
91+
return factory().createEmptyTuple();
92+
}
93+
}
94+
}

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,19 @@
2626

2727
package com.oracle.graal.python.builtins.objects.code;
2828

29-
import java.util.ArrayList;
3029
import java.util.List;
3130

3231
import com.oracle.graal.python.builtins.Builtin;
3332
import com.oracle.graal.python.builtins.CoreFunctions;
3433
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
3534
import com.oracle.graal.python.builtins.PythonBuiltins;
36-
import com.oracle.graal.python.builtins.modules.BuiltinFunctions.GlobalsNode;
3735
import com.oracle.graal.python.builtins.objects.PNone;
38-
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.ContainsKeyNode;
39-
import com.oracle.graal.python.builtins.objects.dict.PDict;
4036
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
4137
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
4238
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
43-
import com.oracle.truffle.api.dsl.Cached;
4439
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
4540
import com.oracle.truffle.api.dsl.NodeFactory;
4641
import com.oracle.truffle.api.dsl.Specialization;
47-
import com.oracle.truffle.api.frame.VirtualFrame;
4842

4943
@CoreFunctions(extendClasses = PythonBuiltinClassType.PCode)
5044
public class CodeBuiltins extends PythonBuiltins {
@@ -224,28 +218,6 @@ protected Object get(PCode self) {
224218
}
225219
}
226220

227-
@Builtin(name = "truffle_co_globals", minNumOfPositionalArgs = 1, isGetter = true)
228-
@GenerateNodeFactory
229-
public abstract static class GetGlobalVarNamesNode extends PythonBuiltinNode {
230-
@Specialization
231-
protected Object get(VirtualFrame frame, PCode self,
232-
@Cached GlobalsNode globalsNode,
233-
@Cached ContainsKeyNode containsKeyNode) {
234-
Object[] varNames = self.getGlobalAndBuiltinVarNames();
235-
if (varNames != null) {
236-
PDict globals = (PDict) globalsNode.execute(frame);
237-
ArrayList<Object> vars = new ArrayList<>();
238-
for (Object name : varNames) {
239-
if (containsKeyNode.execute(frame, globals.getDictStorage(), name)) {
240-
vars.add(name);
241-
}
242-
}
243-
return factory().createTuple(vars.toArray());
244-
}
245-
return PNone.NONE;
246-
}
247-
}
248-
249221
@Builtin(name = "co_lnotab", minNumOfPositionalArgs = 1, isGetter = true)
250222
@GenerateNodeFactory
251223
public abstract static class GetLNoTabNode extends PythonBuiltinNode {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ private static Object[] extractVarnames(RootNode rootNode, String[] parameterIds
250250
}
251251

252252
@TruffleBoundary
253-
private static Object[] extractGlobalVarnames(RootNode rootNode) {
253+
private static Object[] extractGlobalAndBuiltinVarnames(RootNode rootNode) {
254254
RootNode funcRootNode = (rootNode instanceof GeneratorFunctionRootNode) ? ((GeneratorFunctionRootNode) rootNode).getFunctionRootNode() : rootNode;
255255
Set<Object> varNameList = new HashSet<>();
256256

@@ -399,7 +399,7 @@ public byte[] getCodestring() {
399399

400400
public Object[] getGlobalAndBuiltinVarNames() {
401401
if (globalAndBuiltinVarNames == null) {
402-
this.globalAndBuiltinVarNames = extractGlobalVarnames(getRootNode());
402+
this.globalAndBuiltinVarNames = extractGlobalAndBuiltinVarnames(getRootNode());
403403
}
404404
return globalAndBuiltinVarNames;
405405
}

0 commit comments

Comments
 (0)