Skip to content

Commit 2099895

Browse files
fangererfangerer
committed
Move CPython C API specific classes to package '...cext.capi'
1 parent 202d492 commit 2099895

File tree

68 files changed

+723
-823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+723
-823
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
*/
2626
package com.oracle.graal.python.builtins.modules;
2727

28-
import static com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols.FUN_ADD_NATIVE_SLOTS;
29-
import static com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols.FUN_PY_OBJECT_NEW;
28+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_ADD_NATIVE_SLOTS;
29+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PY_OBJECT_NEW;
3030
import static com.oracle.graal.python.builtins.objects.range.RangeUtils.canBeInt;
3131
import static com.oracle.graal.python.builtins.objects.range.RangeUtils.canBePint;
32+
import static com.oracle.graal.python.builtins.objects.type.TypeBuiltins.TYPE_ITEMSIZE;
3233
import static com.oracle.graal.python.nodes.BuiltinNames.BOOL;
3334
import static com.oracle.graal.python.nodes.BuiltinNames.BYTEARRAY;
3435
import static com.oracle.graal.python.nodes.BuiltinNames.BYTES;
@@ -71,6 +72,7 @@
7172
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__MODULE__;
7273
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__MRO_ENTRIES__;
7374
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
75+
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__QUALNAME__;
7476
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__SLOTS__;
7577
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__WEAKREF__;
7678
import static com.oracle.graal.python.nodes.SpecialMethodNames.DECODE;
@@ -112,9 +114,9 @@
112114
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
113115
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
114116
import com.oracle.graal.python.builtins.objects.cell.PCell;
115-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
116-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.PCallCapiFunction;
117-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory;
117+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
118+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
119+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory;
118120
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
119121
import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
120122
import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
@@ -170,7 +172,6 @@
170172
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
171173
import com.oracle.graal.python.builtins.objects.type.PythonClass;
172174
import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
173-
import static com.oracle.graal.python.builtins.objects.type.TypeBuiltins.TYPE_ITEMSIZE;
174175
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
175176
import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetBestBaseClassNode;
176177
import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetItemsizeNode;
@@ -182,7 +183,6 @@
182183
import com.oracle.graal.python.nodes.ErrorMessages;
183184
import com.oracle.graal.python.nodes.PGuards;
184185
import com.oracle.graal.python.nodes.SpecialAttributeNames;
185-
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__QUALNAME__;
186186
import com.oracle.graal.python.nodes.SpecialMethodNames;
187187
import static com.oracle.graal.python.nodes.SpecialMethodNames.__BYTES__;
188188
import com.oracle.graal.python.nodes.attributes.GetAttributeNode;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
import com.oracle.graal.python.builtins.CoreFunctions;
4747
import com.oracle.graal.python.builtins.PythonBuiltins;
4848
import com.oracle.graal.python.builtins.objects.PNone;
49-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.AsCharPointerNode;
50-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.GetNativeNullNode;
51-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToSulongNode;
49+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsCharPointerNode;
50+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetNativeNullNode;
51+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
5252
import com.oracle.graal.python.builtins.objects.str.PString;
5353
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
5454
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
import com.oracle.graal.python.builtins.modules.PythonCextBuiltins.PExternalFunctionWrapper;
5050
import com.oracle.graal.python.builtins.modules.PythonCextBuiltinsFactory.DefaultCheckFunctionResultNodeGen;
5151
import com.oracle.graal.python.builtins.objects.PNone;
52-
import com.oracle.graal.python.builtins.objects.cext.CApiGuards;
53-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
54-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ConvertArgsToSulongNode;
55-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.SubRefCntNode;
56-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToBorrowedRefNode;
57-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToJavaStealingNode;
58-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToBorrowedRefNodeGen;
59-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToJavaStealingNodeGen;
60-
import com.oracle.graal.python.builtins.objects.cext.DynamicObjectNativeWrapper;
61-
import com.oracle.graal.python.builtins.objects.cext.PythonNativeWrapper;
52+
import com.oracle.graal.python.builtins.objects.cext.capi.CApiGuards;
53+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
54+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ConvertArgsToSulongNode;
55+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.SubRefCntNode;
56+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToBorrowedRefNode;
57+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToJavaStealingNode;
58+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ToBorrowedRefNodeGen;
59+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ToJavaStealingNodeGen;
60+
import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper;
61+
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper;
6262
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.ConvertPIntToPrimitiveNode;
6363
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodesFactory.ConvertPIntToPrimitiveNodeGen;
6464
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ToArrayNode;
@@ -298,11 +298,11 @@ public static ExternalFunctionInvokeNode create(PExternalFunctionWrapper provide
298298

299299
/**
300300
* Decrements the ref count by one of any
301-
* {@link com.oracle.graal.python.builtins.objects.cext.PythonNativeWrapper} object.
301+
* {@link PythonNativeWrapper} object.
302302
* <p>
303303
* This node avoids memory leaks for arguments given to native.<br>
304304
* Problem description:<br>
305-
* {@link com.oracle.graal.python.builtins.objects.cext.PythonNativeWrapper} objects given to C
305+
* {@link PythonNativeWrapper} objects given to C
306306
* code may go to native, i.e., a handle will be allocated. In this case, no ref count
307307
* manipulation is done since the C code considers the reference to be borrowed and the Python
308308
* code just doesn't do it because we have a GC. This means that the handle will stay allocated

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
import com.oracle.graal.python.builtins.objects.PythonAbstractObjectFactory.PInteropGetAttributeNodeGen;
6262
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
6363
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
64-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.AsPythonObjectNodeGen;
64+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.AsPythonObjectNodeGen;
6565
import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext;
6666
import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyInitObject;
6767
import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyAsPythonObjectNodeGen;
@@ -93,7 +93,6 @@
9393
import com.oracle.graal.python.runtime.PythonOptions;
9494
import com.oracle.graal.python.runtime.exception.PException;
9595
import com.oracle.graal.python.util.PythonUtils;
96-
import com.oracle.truffle.api.Assumption;
9796
import com.oracle.truffle.api.CallTarget;
9897
import com.oracle.truffle.api.CompilerDirectives;
9998
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -178,12 +177,8 @@ public boolean run() {
178177
public abstract static class GetMagic extends PythonBuiltinNode {
179178
static final int MAGIC_NUMBER = 3413;
180179

181-
@Child IntBuiltins.ToBytesNode toBytesNode = IntBuiltins.ToBytesNode.create();
182-
@Child PythonObjectLibrary pol = PythonObjectLibrary.getFactory().createDispatched(1);
183-
184-
public static final Assumption singleContextAssumption() {
185-
return PythonLanguage.getCurrent().singleContextAssumption;
186-
}
180+
@Child private IntBuiltins.ToBytesNode toBytesNode = IntBuiltins.ToBytesNode.create();
181+
@Child private PythonObjectLibrary pol = PythonObjectLibrary.getFactory().createDispatched(1);
187182

188183
@Specialization(assumptions = "singleContextAssumption()")
189184
public PBytes runCachedSingleContext(@SuppressWarnings("unused") VirtualFrame frame,

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

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -96,62 +96,63 @@
9696
import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins;
9797
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
9898
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
99-
import com.oracle.graal.python.builtins.objects.cext.CApiGuards;
100-
import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CByteArrayWrapper;
101-
import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CStringWrapper;
102-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
103-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.AddRefCntNode;
104-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.AllToSulongNode;
105-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.AsCharPointerNode;
106-
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.AsNativeDoubleNode;
107-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.AsPythonObjectNode;
108-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.AsPythonObjectStealingNode;
109-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.BinaryFirstToSulongNode;
110-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.CastToJavaDoubleNode;
111-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.CastToNativeLongNode;
112-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.CextUpcallNode;
113-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ConvertArgsToSulongNode;
114-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.DirectUpcallNode;
115-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.FastCallArgsToSulongNode;
116-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.FastCallWithKeywordsArgsToSulongNode;
117-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.GetNativeNullNode;
118-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.MayRaiseNode;
119-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ObjectUpcallNode;
120-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.PCallCapiFunction;
121-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.PRaiseNativeNode;
122-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ResolveHandleNode;
123-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.TernaryFirstSecondToSulongNode;
124-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.TernaryFirstThirdToSulongNode;
125-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToJavaNode;
126-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToNewRefNode;
127-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.TransformExceptionToNativeNode;
128-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.VoidPtrToJavaNode;
129-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.CastToNativeLongNodeGen;
130-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.PRaiseNativeNodeGen;
131-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToJavaNodeGen;
132-
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.TransformExceptionToNativeNodeGen;
133-
import com.oracle.graal.python.builtins.objects.cext.DynamicObjectNativeWrapper;
134-
import com.oracle.graal.python.builtins.objects.cext.DynamicObjectNativeWrapper.PrimitiveNativeWrapper;
135-
import com.oracle.graal.python.builtins.objects.cext.HandleCache;
136-
import com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols;
137-
import com.oracle.graal.python.builtins.objects.cext.PThreadState;
138-
import com.oracle.graal.python.builtins.objects.cext.PyCFunctionDecorator;
139-
import com.oracle.graal.python.builtins.objects.cext.PyDateTimeCAPIWrapper;
140-
import com.oracle.graal.python.builtins.objects.cext.PySequenceArrayWrapper;
14199
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
142-
import com.oracle.graal.python.builtins.objects.cext.PythonClassNativeWrapper;
143100
import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
144-
import com.oracle.graal.python.builtins.objects.cext.PythonNativeNull;
145101
import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
146-
import com.oracle.graal.python.builtins.objects.cext.PythonNativeWrapper;
147-
import com.oracle.graal.python.builtins.objects.cext.PythonNativeWrapperLibrary;
148-
import com.oracle.graal.python.builtins.objects.cext.UnicodeObjectNodes.UnicodeAsWideCharNode;
149102
import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
150103
import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext.AllocInfo;
104+
import com.oracle.graal.python.builtins.objects.cext.capi.CApiGuards;
105+
import com.oracle.graal.python.builtins.objects.cext.capi.CArrayWrappers.CByteArrayWrapper;
106+
import com.oracle.graal.python.builtins.objects.cext.capi.CArrayWrappers.CStringWrapper;
107+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
108+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AddRefCntNode;
109+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AllToSulongNode;
110+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsCharPointerNode;
111+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsPythonObjectNode;
112+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsPythonObjectStealingNode;
113+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.BinaryFirstToSulongNode;
114+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.CastToJavaDoubleNode;
115+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.CastToNativeLongNode;
116+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.CextUpcallNode;
117+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ConvertArgsToSulongNode;
118+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.DirectUpcallNode;
119+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.FastCallArgsToSulongNode;
120+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.FastCallWithKeywordsArgsToSulongNode;
121+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetNativeNullNode;
122+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.MayRaiseNode;
123+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ObjectUpcallNode;
124+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
125+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PRaiseNativeNode;
126+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ResolveHandleNode;
127+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TernaryFirstSecondToSulongNode;
128+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TernaryFirstThirdToSulongNode;
129+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToJavaNode;
130+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToNewRefNode;
131+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
132+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.VoidPtrToJavaNode;
133+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.CastToNativeLongNodeGen;
134+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.PRaiseNativeNodeGen;
135+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ToJavaNodeGen;
136+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.TransformExceptionToNativeNodeGen;
137+
import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper;
138+
import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PrimitiveNativeWrapper;
139+
import com.oracle.graal.python.builtins.objects.cext.capi.HandleCache;
140+
import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols;
151141
import com.oracle.graal.python.builtins.objects.cext.capi.NativeReferenceCache;
142+
import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
143+
import com.oracle.graal.python.builtins.objects.cext.capi.PyCFunctionDecorator;
144+
import com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeCAPIWrapper;
145+
import com.oracle.graal.python.builtins.objects.cext.capi.PySequenceArrayWrapper;
152146
import com.oracle.graal.python.builtins.objects.cext.capi.PyTruffleObjectAlloc;
153147
import com.oracle.graal.python.builtins.objects.cext.capi.PyTruffleObjectFree;
148+
import com.oracle.graal.python.builtins.objects.cext.capi.PythonClassNativeWrapper;
149+
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeNull;
150+
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper;
151+
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapperLibrary;
152+
import com.oracle.graal.python.builtins.objects.cext.capi.UnicodeObjectNodes.UnicodeAsWideCharNode;
153+
import com.oracle.graal.python.builtins.objects.cext.capi.UnicodeObjectNodesFactory.UnicodeAsWideCharNodeGen;
154154
import com.oracle.graal.python.builtins.objects.cext.common.CExtAsPythonObjectNode;
155+
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.AsNativeDoubleNode;
155156
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.Charsets;
156157
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.ConvertPIntToPrimitiveNode;
157158
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.EncodeNativeStringNode;
@@ -1408,10 +1409,10 @@ Object doUnicode(VirtualFrame frame, String s, long elementSize, long elements,
14081409
try {
14091410
if (asWideCharNode == null) {
14101411
CompilerDirectives.transferToInterpreterAndInvalidate();
1411-
asWideCharNode = insert(UnicodeAsWideCharNode.createLittleEndian());
1412+
asWideCharNode = insert(UnicodeAsWideCharNodeGen.create());
14121413
}
14131414

1414-
PBytes wchars = asWideCharNode.execute(s, elementSize, elements);
1415+
PBytes wchars = asWideCharNode.executeLittleEndian(s, elementSize, elements);
14151416
if (wchars != null) {
14161417
return wchars;
14171418
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
5050
import com.oracle.graal.python.builtins.PythonBuiltins;
5151
import com.oracle.graal.python.builtins.objects.PNone;
52-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
53-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.GetTypeMemberNode;
54-
import com.oracle.graal.python.builtins.objects.cext.NativeMember;
52+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
53+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetTypeMemberNode;
54+
import com.oracle.graal.python.builtins.objects.cext.capi.NativeMember;
5555
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
5656
import com.oracle.graal.python.builtins.objects.dict.PDict;
5757
import com.oracle.graal.python.builtins.objects.module.PythonModule;

0 commit comments

Comments
 (0)