Skip to content

Commit 8bcf36f

Browse files
committed
intrinsified PyImport_XXX
1 parent d939bc8 commit 8bcf36f

File tree

5 files changed

+122
-9
lines changed

5 files changed

+122
-9
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
import com.oracle.graal.python.builtins.modules.cext.PythonCextListBuiltins;
119119
import com.oracle.graal.python.builtins.modules.cext.PythonCextLongBuiltins;
120120
import com.oracle.graal.python.builtins.modules.cext.PythonCextFileBuiltins;
121+
import com.oracle.graal.python.builtins.modules.cext.PythonCextImportBuiltins;
121122
import com.oracle.graal.python.builtins.modules.cext.PythonCextMemoryViewBuiltins;
122123
import com.oracle.graal.python.builtins.modules.cext.PythonCextAbstractBuiltins;
123124
import com.oracle.graal.python.builtins.modules.cext.PythonCextPythonRunBuiltins;
@@ -491,6 +492,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
491492
new PythonCextDictBuiltins(),
492493
new PythonCextFileBuiltins(),
493494
new PythonCextFloatBuiltins(),
495+
new PythonCextImportBuiltins(),
494496
new PythonCextListBuiltins(),
495497
new PythonCextLongBuiltins(),
496498
new PythonCextMemoryViewBuiltins(),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
import com.oracle.graal.python.builtins.modules.io.TextIOWrapperNodes.TextIOWrapperInitNode;
133133
import com.oracle.graal.python.builtins.modules.io.TextIOWrapperNodesFactory.TextIOWrapperInitNodeGen;
134134
import com.oracle.graal.python.builtins.objects.PNone;
135+
import com.oracle.graal.python.builtins.objects.dict.PDict;
135136
import com.oracle.graal.python.builtins.objects.exception.PBaseException;
136137
import com.oracle.graal.python.builtins.objects.frame.PFrame;
137138
import com.oracle.graal.python.builtins.objects.frame.PFrame.Reference;
@@ -642,6 +643,10 @@ private static void callClose(Object obj) {
642643
}
643644
}
644645

646+
public PDict getModules() {
647+
return (PDict) getBuiltinConstants().get(MODULES);
648+
}
649+
645650
@Builtin(name = "exc_info", needsFrame = true)
646651
@GenerateNodeFactory
647652
public abstract static class ExcInfoNode extends PythonBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import static com.oracle.graal.python.builtins.modules.cext.PythonCextDictBuiltins.PYTHON_CEXT_DICT;
5151
import static com.oracle.graal.python.builtins.modules.cext.PythonCextFileBuiltins.PYTHON_CEXT_FILE;
5252
import static com.oracle.graal.python.builtins.modules.cext.PythonCextFloatBuiltins.PYTHON_CEXT_FLOAT;
53+
import static com.oracle.graal.python.builtins.modules.cext.PythonCextImportBuiltins.PYTHON_CEXT_IMPORT;
5354
import static com.oracle.graal.python.builtins.modules.cext.PythonCextListBuiltins.PYTHON_CEXT_LIST;
5455
import static com.oracle.graal.python.builtins.modules.cext.PythonCextLongBuiltins.PYTHON_CEXT_LONG;
5556
import static com.oracle.graal.python.builtins.modules.cext.PythonCextMemoryViewBuiltins.PYTHON_CEXT_MEMORYVIEW;
@@ -382,6 +383,7 @@ public void postInitialize(Python3Core core) {
382383
addModuleDict(cext, PYTHON_CEXT_DICT, core);
383384
addModuleDict(cext, PYTHON_CEXT_FILE, core);
384385
addModuleDict(cext, PYTHON_CEXT_FLOAT, core);
386+
addModuleDict(cext, PYTHON_CEXT_IMPORT, core);
385387
addModuleDict(cext, PYTHON_CEXT_LONG, core);
386388
addModuleDict(cext, PYTHON_CEXT_LIST, core);
387389
addModuleDict(cext, PYTHON_CEXT_MEMORYVIEW, core);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
/*
2+
* Copyright (c) 2017, 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.builtins.modules.cext;
42+
43+
import com.oracle.graal.python.builtins.Builtin;
44+
import java.util.List;
45+
import com.oracle.graal.python.builtins.CoreFunctions;
46+
import com.oracle.graal.python.builtins.Python3Core;
47+
import com.oracle.graal.python.builtins.PythonBuiltins;
48+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetNativeNullNode;
49+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
50+
import com.oracle.graal.python.builtins.objects.str.PString;
51+
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
52+
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
53+
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
54+
import com.oracle.graal.python.nodes.statement.AbstractImportNode;
55+
import com.oracle.graal.python.runtime.exception.PException;
56+
import com.oracle.truffle.api.dsl.Cached;
57+
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
58+
import com.oracle.truffle.api.dsl.NodeFactory;
59+
import com.oracle.truffle.api.dsl.Specialization;
60+
61+
@CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
62+
@GenerateNodeFactory
63+
public class PythonCextImportBuiltins extends PythonBuiltins {
64+
65+
@Override
66+
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
67+
return PythonCextImportBuiltinsFactory.getFactories();
68+
}
69+
70+
@Override
71+
public void initialize(Python3Core core) {
72+
super.initialize(core);
73+
}
74+
75+
@Builtin(name = "PyImport_ImportModule", minNumOfPositionalArgs = 1)
76+
@GenerateNodeFactory
77+
public abstract static class PyImportImportModuleNode extends PythonUnaryBuiltinNode {
78+
@Specialization
79+
public Object imp(String name,
80+
@Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
81+
@Cached GetNativeNullNode getNativeNull) {
82+
try {
83+
return AbstractImportNode.importModule(name, new String[]{"*"});
84+
} catch (PException e) {
85+
transformExceptionToNativeNode.execute(e);
86+
return getNativeNull.execute();
87+
}
88+
}
89+
90+
@Specialization
91+
public Object imp(PString name,
92+
@Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
93+
@Cached GetNativeNullNode getNativeNull) {
94+
return imp(name.getValue(), transformExceptionToNativeNode, getNativeNull);
95+
}
96+
}
97+
98+
@Builtin(name = "PyImport_GetModuleDict")
99+
@GenerateNodeFactory
100+
public abstract static class PyImportGetModuleDictNode extends PythonBuiltinNode {
101+
@Specialization
102+
public Object getModuleDict(@Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
103+
@Cached GetNativeNullNode getNativeNull) {
104+
try {
105+
return getContext().getSysModules();
106+
} catch (PException e) {
107+
transformExceptionToNativeNode.execute(e);
108+
return getNativeNull.execute();
109+
}
110+
}
111+
}
112+
113+
}

graalpython/lib-graalpython/python_cext.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -473,15 +473,6 @@ def Time_FromTimeAndFold(h, m, s, us, tz, fold, typ):
473473
datetime.timedelta.__basicsize__ = import_c_func("get_PyDateTime_Delta_basicsize", capi_library)()
474474

475475

476-
@may_raise
477-
def PyImport_ImportModule(name):
478-
return __import__(name, fromlist=["*"])
479-
480-
481-
@may_raise
482-
def PyImport_GetModuleDict():
483-
return sys.modules
484-
485476
@may_raise
486477
def PyEval_GetBuiltins():
487478
global __builtins_module_dict

0 commit comments

Comments
 (0)