Skip to content

Commit 234c1f1

Browse files
committed
intrinsified PyNamespace_XXX
1 parent 8bcf36f commit 234c1f1

File tree

4 files changed

+110
-8
lines changed

4 files changed

+110
-8
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
@@ -121,6 +121,7 @@
121121
import com.oracle.graal.python.builtins.modules.cext.PythonCextImportBuiltins;
122122
import com.oracle.graal.python.builtins.modules.cext.PythonCextMemoryViewBuiltins;
123123
import com.oracle.graal.python.builtins.modules.cext.PythonCextAbstractBuiltins;
124+
import com.oracle.graal.python.builtins.modules.cext.PythonCextNamespaceBuiltins;
124125
import com.oracle.graal.python.builtins.modules.cext.PythonCextPythonRunBuiltins;
125126
import com.oracle.graal.python.builtins.modules.cext.PythonCextSetBuiltins;
126127
import com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltins;
@@ -497,6 +498,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
497498
new PythonCextLongBuiltins(),
498499
new PythonCextMemoryViewBuiltins(),
499500
new PythonCextPythonRunBuiltins(),
501+
new PythonCextNamespaceBuiltins(),
500502
new PythonCextSetBuiltins(),
501503
new PythonCextSliceBuiltins(),
502504
new PythonCextSysBuiltins(),

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
@@ -54,6 +54,7 @@
5454
import static com.oracle.graal.python.builtins.modules.cext.PythonCextListBuiltins.PYTHON_CEXT_LIST;
5555
import static com.oracle.graal.python.builtins.modules.cext.PythonCextLongBuiltins.PYTHON_CEXT_LONG;
5656
import static com.oracle.graal.python.builtins.modules.cext.PythonCextMemoryViewBuiltins.PYTHON_CEXT_MEMORYVIEW;
57+
import static com.oracle.graal.python.builtins.modules.cext.PythonCextNamespaceBuiltins.PYTHON_CEXT_NAMESPACE;
5758
import static com.oracle.graal.python.builtins.modules.cext.PythonCextPythonRunBuiltins.PYTHON_CEXT_PYTHON_RUN;
5859
import static com.oracle.graal.python.builtins.modules.cext.PythonCextSetBuiltins.PYTHON_CEXT_SET;
5960
import static com.oracle.graal.python.builtins.modules.cext.PythonCextSliceBuiltins.PYTHON_CEXT_SLICE;
@@ -387,6 +388,7 @@ public void postInitialize(Python3Core core) {
387388
addModuleDict(cext, PYTHON_CEXT_LONG, core);
388389
addModuleDict(cext, PYTHON_CEXT_LIST, core);
389390
addModuleDict(cext, PYTHON_CEXT_MEMORYVIEW, core);
391+
addModuleDict(cext, PYTHON_CEXT_NAMESPACE, core);
390392
addModuleDict(cext, PYTHON_CEXT_PYTHON_RUN, core);
391393
addModuleDict(cext, PYTHON_CEXT_SET, core);
392394
addModuleDict(cext, PYTHON_CEXT_SLICE, core);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
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.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.common.HashingStorage.DictEntry;
51+
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
52+
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.HashingStorageIterable;
53+
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.HashingStorageIterator;
54+
import com.oracle.graal.python.builtins.objects.dict.PDict;
55+
import com.oracle.graal.python.builtins.objects.namespace.PSimpleNamespace;
56+
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
57+
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
58+
import com.oracle.graal.python.runtime.exception.PException;
59+
import com.oracle.truffle.api.dsl.Cached;
60+
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
61+
import com.oracle.truffle.api.dsl.NodeFactory;
62+
import com.oracle.truffle.api.dsl.Specialization;
63+
import com.oracle.truffle.api.frame.VirtualFrame;
64+
import com.oracle.truffle.api.library.CachedLibrary;
65+
import com.oracle.truffle.api.object.DynamicObjectLibrary;
66+
67+
@CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
68+
@GenerateNodeFactory
69+
public class PythonCextNamespaceBuiltins extends PythonBuiltins {
70+
71+
@Override
72+
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
73+
return PythonCextNamespaceBuiltinsFactory.getFactories();
74+
}
75+
76+
@Override
77+
public void initialize(Python3Core core) {
78+
super.initialize(core);
79+
}
80+
81+
@Builtin(name = "_PyNamespace_New", minNumOfPositionalArgs = 1)
82+
@GenerateNodeFactory
83+
public abstract static class PyNamespaceNewNode extends PythonBuiltinNode {
84+
@Specialization
85+
public Object imp(VirtualFrame frame, PDict dict,
86+
@CachedLibrary(limit = "1") HashingStorageLibrary lib,
87+
@CachedLibrary(limit = "1") DynamicObjectLibrary dyLib,
88+
@Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
89+
@Cached GetNativeNullNode getNativeNull) {
90+
try {
91+
PSimpleNamespace ns = factory().createSimpleNamespace();
92+
HashingStorageIterable<DictEntry> entries = lib.entries(dict.getDictStorage());
93+
HashingStorageIterator<DictEntry> it = entries.iterator();
94+
while (it.hasNext()) {
95+
DictEntry e = it.next();
96+
dyLib.put(ns, e.key, e.value);
97+
}
98+
return ns;
99+
} catch (PException e) {
100+
transformExceptionToNativeNode.execute(e);
101+
return getNativeNull.execute();
102+
}
103+
}
104+
}
105+
106+
}

graalpython/lib-graalpython/python_cext.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,3 @@ def PyEval_GetBuiltins():
485485
def sequence_clear():
486486
return 0
487487

488-
namespace_type = None
489-
@may_raise
490-
def _PyNamespace_New(kwds):
491-
global namespace_type
492-
if not namespace_type:
493-
from types import SimpleNamespace as namespace_type
494-
return namespace_type(**kwds)
495-

0 commit comments

Comments
 (0)