Skip to content

Commit 824f1a4

Browse files
committed
intrinsified PyCallIter_New
1 parent a47d678 commit 824f1a4

File tree

4 files changed

+103
-21
lines changed

4 files changed

+103
-21
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.PythonCextIterBuiltins;
124125
import com.oracle.graal.python.builtins.modules.cext.PythonCextNamespaceBuiltins;
125126
import com.oracle.graal.python.builtins.modules.cext.PythonCextPythonRunBuiltins;
126127
import com.oracle.graal.python.builtins.modules.cext.PythonCextSetBuiltins;
@@ -495,6 +496,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
495496
new PythonCextFileBuiltins(),
496497
new PythonCextFloatBuiltins(),
497498
new PythonCextImportBuiltins(),
499+
new PythonCextIterBuiltins(),
498500
new PythonCextListBuiltins(),
499501
new PythonCextLongBuiltins(),
500502
new PythonCextMemoryViewBuiltins(),

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
import com.oracle.graal.python.builtins.modules.BuiltinConstructors.MappingproxyNode;
8181
import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
8282
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltinsFactory.CreateFunctionNodeGen;
83-
import static com.oracle.graal.python.builtins.modules.cext.PythonCextTupleBuiltins.PYTHON_CEXT_TUPLE;
8483
import com.oracle.graal.python.builtins.objects.PNone;
8584
import com.oracle.graal.python.builtins.objects.PNotImplemented;
8685
import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins;
@@ -168,12 +167,6 @@
168167
import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
169168
import com.oracle.graal.python.builtins.objects.common.HashingStorage;
170169
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
171-
<<<<<<< HEAD
172-
import com.oracle.graal.python.builtins.objects.common.IndexNodes.NormalizeIndexNode;
173-
=======
174-
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.HashingStorageIterable;
175-
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.HashingStorageIterator;
176-
>>>>>>> moved PythonCextBuiltins.PyTupleXXX to PythonCextTupleBuiltins
177170
import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
178171
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
179172
import com.oracle.graal.python.builtins.objects.common.SequenceNodes.GetObjectArrayNode;
@@ -192,7 +185,6 @@
192185
import com.oracle.graal.python.builtins.objects.function.Signature;
193186
import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
194187
import com.oracle.graal.python.builtins.objects.ints.PInt;
195-
import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
196188
import com.oracle.graal.python.builtins.objects.memoryview.BufferLifecycleManager;
197189
import com.oracle.graal.python.builtins.objects.memoryview.MemoryViewNodes;
198190
import com.oracle.graal.python.builtins.objects.memoryview.NativeBufferLifecycleManager;
@@ -1531,15 +1523,6 @@ PThreadState get() {
15311523
}
15321524
}
15331525

1534-
@Builtin(name = "PyTruffle_SeqIter_New", minNumOfPositionalArgs = 1)
1535-
@GenerateNodeFactory
1536-
public abstract static class SeqIterNewNode extends PythonBuiltinNode {
1537-
@Specialization
1538-
PSequenceIterator call(Object seq) {
1539-
return factory().createSequenceIterator(seq);
1540-
}
1541-
}
1542-
15431526
@Builtin(name = "PyTruffle_BuiltinMethod", minNumOfPositionalArgs = 2)
15441527
@GenerateNodeFactory
15451528
public abstract static class BuiltinMethodNode extends PythonBuiltinNode {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
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 java.util.List;
44+
import com.oracle.graal.python.builtins.Builtin;
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.modules.BuiltinFunctions.IterNode;
49+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetNativeNullNode;
50+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
51+
import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
52+
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
53+
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
54+
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
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+
import com.oracle.truffle.api.frame.VirtualFrame;
61+
62+
@CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
63+
@GenerateNodeFactory
64+
public class PythonCextIterBuiltins extends PythonBuiltins {
65+
66+
@Override
67+
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
68+
return PythonCextIterBuiltinsFactory.getFactories();
69+
}
70+
71+
@Override
72+
public void initialize(Python3Core core) {
73+
super.initialize(core);
74+
}
75+
76+
@Builtin(name = "PyTruffle_SeqIter_New", minNumOfPositionalArgs = 1)
77+
@GenerateNodeFactory
78+
public abstract static class SeqIterNewNode extends PythonBuiltinNode {
79+
@Specialization
80+
PSequenceIterator call(Object seq) {
81+
return factory().createSequenceIterator(seq);
82+
}
83+
}
84+
85+
@Builtin(name = "PyCallIter_New", minNumOfPositionalArgs = 2)
86+
@GenerateNodeFactory
87+
public abstract static class PyCallIterNewNode extends PythonBinaryBuiltinNode {
88+
@Specialization
89+
public Object getItem(VirtualFrame frame, Object it, Object sentinel,
90+
@Cached IterNode iterNode,
91+
@Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
92+
@Cached GetNativeNullNode getNativeNullNode) {
93+
try {
94+
return iterNode.execute(frame, it, sentinel);
95+
} catch (PException e) {
96+
transformExceptionToNativeNode.execute(e);
97+
return getNativeNullNode.execute();
98+
}
99+
}
100+
}
101+
}

graalpython/lib-graalpython/python_cext.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ def decorator(fun):
5050
return make_may_raise_wrapper(fun, error_result)
5151
return decorator
5252

53-
@may_raise
54-
def PyCallIter_New(it, sentinel):
55-
return iter(it, sentinel)
56-
5753
@may_raise(-1)
5854
def PyModule_AddObject(m, k, v):
5955
m.__dict__[k] = v

0 commit comments

Comments
 (0)