Skip to content

Commit c9418c6

Browse files
cosminbascacosminbasca
committed
Add PyEvalGetGlobals / PyImportImport and PyImportGetModule builtin lib nodes
1 parent b868e3c commit c9418c6

File tree

5 files changed

+232
-8
lines changed

5 files changed

+232
-8
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
131131
import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
132132
import com.oracle.graal.python.lib.PyCallableCheckNode;
133+
import com.oracle.graal.python.lib.PyEvalGetGlobals;
133134
import com.oracle.graal.python.lib.PyMappingCheckNode;
134135
import com.oracle.graal.python.lib.PyNumberAsSizeNode;
135136
import com.oracle.graal.python.lib.PyNumberIndexNode;
@@ -2145,15 +2146,13 @@ private Object iterateGeneric(VirtualFrame frame, Object iterator, Object start,
21452146
@Builtin(name = "globals")
21462147
@GenerateNodeFactory
21472148
public abstract static class GlobalsNode extends PythonBuiltinNode {
2148-
@Child private ReadCallerFrameNode readCallerFrameNode = ReadCallerFrameNode.create();
2149-
21502149
private final ConditionProfile condProfile = ConditionProfile.createBinaryProfile();
21512150

21522151
@Specialization
21532152
public Object globals(VirtualFrame frame,
2153+
@Cached PyEvalGetGlobals getGlobals,
21542154
@Cached GetOrCreateDictNode getDict) {
2155-
PFrame callerFrame = readCallerFrameNode.executeWith(frame, 0);
2156-
PythonObject globals = callerFrame.getGlobals();
2155+
Object globals = getGlobals.execute(frame);
21572156
if (condProfile.profile(globals instanceof PythonModule)) {
21582157
return getDict.execute(globals);
21592158
} else {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyEvalGetGlobals.java

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright (c) 2021, 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.lib;
42+
43+
import com.oracle.graal.python.nodes.PNodeWithState;
44+
import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
45+
import com.oracle.truffle.api.dsl.Cached;
46+
import com.oracle.truffle.api.dsl.Specialization;
47+
import com.oracle.truffle.api.frame.VirtualFrame;
48+
49+
/**
50+
* Equivalent of CPython's {@code PyEval_GetGlobals}.
51+
*/
52+
public abstract class PyEvalGetGlobals extends PNodeWithState {
53+
public abstract Object execute(VirtualFrame frame);
54+
55+
@Specialization
56+
Object doGeneric(VirtualFrame frame,
57+
@Cached ReadCallerFrameNode readCallerFrameNode) {
58+
return readCallerFrameNode.executeWith(frame, 0).getGlobals();
59+
}
60+
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyImportGetModule.java

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
* Copyright (c) 2021, 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.lib;
42+
43+
import static com.oracle.graal.python.nodes.ErrorMessages.UNABLE_TO_GET_S;
44+
45+
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
46+
import com.oracle.graal.python.builtins.objects.dict.DictBuiltins;
47+
import com.oracle.graal.python.builtins.objects.dict.PDict;
48+
import com.oracle.graal.python.nodes.PNodeWithState;
49+
import com.oracle.truffle.api.dsl.Cached;
50+
import com.oracle.truffle.api.dsl.Specialization;
51+
import com.oracle.truffle.api.frame.VirtualFrame;
52+
53+
/**
54+
* Equivalent of CPython's {@code PyImport_GetModule}.
55+
*/
56+
public abstract class PyImportGetModule extends PNodeWithState {
57+
public abstract Object execute(VirtualFrame frame, Object name);
58+
59+
@Specialization
60+
Object doGeneric(VirtualFrame frame, Object name,
61+
@Cached DictBuiltins.GetItemNode getDictItemNode) {
62+
final PDict sysModules = getContext().getSysModules();
63+
if (sysModules == null) {
64+
throw raise(PythonBuiltinClassType.RuntimeError, UNABLE_TO_GET_S, "sys.modules");
65+
}
66+
return getDictItemNode.execute(frame, sysModules, name);
67+
}
68+
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyImportImport.java

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
/*
2+
* Copyright (c) 2021, 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.lib;
42+
43+
import static com.oracle.graal.python.nodes.BuiltinNames.BUILTINS;
44+
import static com.oracle.graal.python.nodes.BuiltinNames.__BUILTINS__;
45+
import static com.oracle.graal.python.nodes.BuiltinNames.__IMPORT__;
46+
47+
import com.oracle.graal.python.builtins.objects.dict.PDict;
48+
import com.oracle.graal.python.builtins.objects.function.PKeyword;
49+
import com.oracle.graal.python.nodes.PNodeWithState;
50+
import com.oracle.graal.python.nodes.call.CallNode;
51+
import com.oracle.graal.python.nodes.statement.AbstractImportNode;
52+
import com.oracle.truffle.api.dsl.Cached;
53+
import com.oracle.truffle.api.dsl.Specialization;
54+
import com.oracle.truffle.api.frame.VirtualFrame;
55+
56+
/**
57+
* Equivalent of CPython's {@code PyImport_Import}.
58+
*/
59+
public abstract class PyImportImport extends PNodeWithState {
60+
public abstract Object execute(VirtualFrame frame, Object name);
61+
62+
@Specialization
63+
Object doGeneric(VirtualFrame frame, Object moduleName,
64+
@Cached PyImportGetModule importGetModule,
65+
@Cached PyObjectGetItem getItemNode,
66+
@Cached PyObjectGetAttr getAttrNode,
67+
@Cached CallNode callNode,
68+
@Cached AbstractImportNode.PyImportImportModuleLevelObject importModuleLevelObject,
69+
@Cached PyEvalGetGlobals getGlobals) {
70+
// Get the builtins from current globals
71+
Object globals = getGlobals.execute(frame);
72+
Object builtins;
73+
if (globals != null) {
74+
builtins = getItemNode.execute(frame, globals, __BUILTINS__);
75+
} else {
76+
// No globals -- use standard builtins, and fake globals
77+
builtins = importModuleLevelObject.execute(frame, getContext(), BUILTINS, null, null, 0);
78+
globals = factory().createDict(new PKeyword[]{new PKeyword(__BUILTINS__, builtins)});
79+
}
80+
81+
// Get the __import__ function from the builtins
82+
Object importFunc;
83+
if (builtins instanceof PDict) {
84+
importFunc = getItemNode.execute(frame, builtins, __IMPORT__);
85+
} else {
86+
importFunc = getAttrNode.execute(frame, builtins, __IMPORT__);
87+
}
88+
89+
// Call the __import__ function with the proper argument list Always use absolute import
90+
// here. Calling for side-effect of import.
91+
callNode.execute(importFunc, new Object[]{moduleName}, new PKeyword[]{
92+
new PKeyword("globals", globals), new PKeyword("locals", globals),
93+
new PKeyword("fromlist", factory().createList()), new PKeyword("level", 0)
94+
});
95+
return importGetModule.execute(frame, moduleName);
96+
}
97+
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ static Object importName(VirtualFrame frame, PythonContext context, PythonModule
158158
@Cached CallNode importCallNode,
159159
@Cached GetDictFromGlobalsNode getDictNode,
160160
@Cached PythonObjectFactory factory,
161-
@Cached ImportModuleLevelObject importModuleLevel) {
161+
@Cached PyImportImportModuleLevelObject importModuleLevel) {
162162
Object importFunc = builtinsDylib.getOrDefault(builtins, __IMPORT__, null);
163163
if (importFunc == null) {
164164
throw raiseNode.raiseImportError(frame, IMPORT_NOT_FOUND);
@@ -179,8 +179,8 @@ static Object importName(VirtualFrame frame, PythonContext context, PythonModule
179179
/**
180180
* Equivalent of PyImport_ImportModuleLevelObject
181181
*/
182-
abstract static class ImportModuleLevelObject extends Node {
183-
protected abstract Object execute(VirtualFrame frame, PythonContext context, String name, Object globals, String[] fromList, int level);
182+
public abstract static class PyImportImportModuleLevelObject extends Node {
183+
public abstract Object execute(VirtualFrame frame, PythonContext context, String name, Object globals, String[] fromList, int level);
184184

185185
@SuppressWarnings("unused")
186186
@Specialization(guards = "level < 0")
@@ -193,7 +193,7 @@ protected static final int indexOfDot(String name) {
193193
}
194194

195195
@Specialization(guards = {"level == 0", "fromList.length == 0", "dotIndex < 0"})
196-
static Object levelZeroNoFromlist(VirtualFrame frame, PythonContext context, String name, @SuppressWarnings("unused") Object globals, @SuppressWarnings("unused") String[] fromList,
196+
public static Object levelZeroNoFromlist(VirtualFrame frame, PythonContext context, String name, @SuppressWarnings("unused") Object globals, @SuppressWarnings("unused") String[] fromList,
197197
@SuppressWarnings("unused") int level,
198198
@SuppressWarnings("unused") @Bind("indexOfDot(name)") int dotIndex,
199199
@Cached PRaiseNode raiseNode,

0 commit comments

Comments
 (0)