Skip to content

Commit 6084ccb

Browse files
qunaibitqunaibit
committed
trivial LazyPythonClass removals
1 parent 712ae45 commit 6084ccb

File tree

10 files changed

+73
-82
lines changed

10 files changed

+73
-82
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
import com.oracle.graal.python.builtins.objects.thread.ThreadBuiltins;
173173
import com.oracle.graal.python.builtins.objects.traceback.TracebackBuiltins;
174174
import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
175-
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
176175
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
177176
import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
178177
import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
@@ -747,7 +746,7 @@ public SourceSection getSourceSection() {
747746
@TruffleBoundary
748747
public RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Node location, String message, Object... arguments) {
749748
PBaseException instance;
750-
LazyPythonClass cls;
749+
Object cls;
751750
switch (type) {
752751
case Indentation:
753752
cls = IndentationError;

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
4141
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
4242
import com.oracle.graal.python.builtins.objects.range.PRange;
43-
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
4443
import com.oracle.graal.python.nodes.ErrorMessages;
4544
import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
4645
import com.oracle.graal.python.nodes.control.GetNextNode;
@@ -71,15 +70,15 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
7170
abstract static class PythonArrayNode extends PythonBuiltinNode {
7271

7372
@Specialization(guards = "isNoValue(initializer)")
74-
PArray array(LazyPythonClass cls, String typeCode, @SuppressWarnings("unused") PNone initializer) {
73+
PArray array(Object cls, String typeCode, @SuppressWarnings("unused") PNone initializer) {
7574
/**
7675
* TODO @param typeCode should be a char, not a string
7776
*/
7877
return makeEmptyArray(cls, typeCode.charAt(0));
7978
}
8079

8180
@Specialization
82-
PArray arrayWithRangeInitializer(LazyPythonClass cls, String typeCode, PRange range) {
81+
PArray arrayWithRangeInitializer(Object cls, String typeCode, PRange range) {
8382
if (!typeCode.equals("i")) {
8483
typeError(typeCode, range);
8584
}
@@ -99,7 +98,7 @@ PArray arrayWithRangeInitializer(LazyPythonClass cls, String typeCode, PRange ra
9998
}
10099

101100
@Specialization
102-
PArray arrayWithSequenceInitializer(LazyPythonClass cls, String typeCode, String str) {
101+
PArray arrayWithSequenceInitializer(Object cls, String typeCode, String str) {
103102
if (!typeCode.equals("c")) {
104103
typeError(typeCode, str);
105104
}
@@ -128,7 +127,7 @@ protected boolean isDoubleArray(String typeCode) {
128127
}
129128

130129
@Specialization(guards = "isByteArray(typeCode)")
131-
PArray arrayByteInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
130+
PArray arrayByteInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
132131
@Cached("createCast()") CastToByteNode castToByteNode,
133132
@Cached("create()") GetIteratorNode getIterator,
134133
@Cached("create()") GetNextNode next,
@@ -153,15 +152,15 @@ PArray arrayByteInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWa
153152
}
154153

155154
@Specialization(guards = "isCharArray(typeCode)")
156-
PArray arrayCharInitializer(LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
155+
PArray arrayCharInitializer(Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
157156
@Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode,
158157
@Cached SequenceStorageNodes.ToByteArrayNode toByteArrayNode) {
159158
byte[] byteArray = toByteArrayNode.execute(getSequenceStorageNode.execute(initializer));
160159
return factory().createArray(cls, byteArray);
161160
}
162161

163162
@Specialization(guards = "isIntArray(typeCode)")
164-
PArray arrayIntInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
163+
PArray arrayIntInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
165164
@Cached("create()") GetIteratorNode getIterator,
166165
@Cached("create()") GetNextNode next,
167166
@Cached("create()") IsBuiltinClassProfile errorProfile,
@@ -190,7 +189,7 @@ PArray arrayIntInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWar
190189
}
191190

192191
@Specialization(guards = "isLongArray(typeCode)")
193-
PArray arrayLongInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
192+
PArray arrayLongInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
194193
@Cached("create()") GetIteratorNode getIterator,
195194
@Cached("create()") GetNextNode next,
196195
@Cached("create()") IsBuiltinClassProfile errorProfile,
@@ -219,7 +218,7 @@ PArray arrayLongInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWa
219218
}
220219

221220
@Specialization(guards = "isDoubleArray(typeCode)")
222-
PArray arrayDoubleInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
221+
PArray arrayDoubleInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
223222
@Cached("create()") GetIteratorNode getIterator,
224223
@Cached("create()") GetNextNode next,
225224
@Cached("create()") IsBuiltinClassProfile errorProfile,
@@ -251,7 +250,7 @@ PArray arrayDoubleInitializer(VirtualFrame frame, LazyPythonClass cls, @Suppress
251250

252251
@Specialization
253252
@TruffleBoundary
254-
PArray arrayWithObjectInitializer(@SuppressWarnings("unused") LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, Object initializer) {
253+
PArray arrayWithObjectInitializer(@SuppressWarnings("unused") Object cls, @SuppressWarnings("unused") String typeCode, Object initializer) {
255254
if (!(isIntArray(typeCode) || isByteArray(typeCode) || isDoubleArray(typeCode) || isCharArray(typeCode))) {
256255
// TODO implement support for typecodes: b, B, u, h, H, i, I, l, L, q, Q, f or d
257256
throw raise(ValueError, ErrorMessages.BAD_TYPECODE);
@@ -260,7 +259,7 @@ PArray arrayWithObjectInitializer(@SuppressWarnings("unused") LazyPythonClass cl
260259
}
261260

262261
@Specialization(guards = "!isString(typeCode)")
263-
PArray noArray(@SuppressWarnings("unused") LazyPythonClass cls, Object typeCode, @SuppressWarnings("unused") Object initializer) {
262+
PArray noArray(@SuppressWarnings("unused") Object cls, Object typeCode, @SuppressWarnings("unused") Object initializer) {
264263
throw raise(TypeError, ErrorMessages.ARG_MUST_BE_UNICODE, "array()", 1, typeCode);
265264
}
266265

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
5959
import com.oracle.graal.python.builtins.objects.ints.PInt;
6060
import com.oracle.graal.python.builtins.objects.mmap.PMMap;
61-
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
6261
import com.oracle.graal.python.nodes.ErrorMessages;
6362
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
6463
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -99,25 +98,25 @@ public abstract static class MMapNode extends PythonBuiltinNode {
9998
private final BranchProfile invalidLengthProfile = BranchProfile.create();
10099

101100
@Specialization(guards = {"isAnonymous(fd)", "isNoValue(access)", "isNoValue(offset)"})
102-
PMMap doAnonymous(LazyPythonClass clazz, @SuppressWarnings("unused") long fd, int length, @SuppressWarnings("unused") Object tagname, @SuppressWarnings("unused") PNone access,
101+
PMMap doAnonymous(Object clazz, @SuppressWarnings("unused") long fd, int length, @SuppressWarnings("unused") Object tagname, @SuppressWarnings("unused") PNone access,
103102
@SuppressWarnings("unused") PNone offset) {
104103
checkLength(length);
105104
return factory().createMMap(clazz, new AnonymousMap(length), length, 0);
106105
}
107106

108107
@Specialization(guards = {"fd >= 0", "isNoValue(access)", "isNoValue(offset)"})
109-
PMMap doFile(LazyPythonClass clazz, long fd, int length, Object tagname, @SuppressWarnings("unused") PNone access, @SuppressWarnings("unused") PNone offset) {
108+
PMMap doFile(Object clazz, long fd, int length, Object tagname, @SuppressWarnings("unused") PNone access, @SuppressWarnings("unused") PNone offset) {
110109
return doFile(clazz, fd, length, tagname, ACCESS_DEFAULT, 0);
111110
}
112111

113112
@Specialization(guards = {"fd >= 0", "isNoValue(offset)"})
114-
PMMap doFile(LazyPythonClass clazz, long fd, int length, Object tagname, int access, @SuppressWarnings("unused") PNone offset) {
113+
PMMap doFile(Object clazz, long fd, int length, Object tagname, int access, @SuppressWarnings("unused") PNone offset) {
115114
return doFile(clazz, fd, length, tagname, access, 0);
116115
}
117116

118117
// mmap(fileno, length, tagname=None, access=ACCESS_DEFAULT[, offset])
119118
@Specialization(guards = "fd >= 0")
120-
PMMap doFile(LazyPythonClass clazz, long fd, long length, @SuppressWarnings("unused") Object tagname, @SuppressWarnings("unused") int access, long offset) {
119+
PMMap doFile(Object clazz, long fd, long length, @SuppressWarnings("unused") Object tagname, @SuppressWarnings("unused") int access, long offset) {
121120
checkLength(length);
122121
int ifd;
123122
try {
@@ -166,7 +165,7 @@ private static Set<StandardOpenOption> set(StandardOpenOption... options) {
166165

167166
@Specialization(guards = "isIllegal(fd)")
168167
@SuppressWarnings("unused")
169-
PMMap doAnonymous(LazyPythonClass clazz, int fd, Object length, Object tagname, PNone access, PNone offset) {
168+
PMMap doAnonymous(Object clazz, int fd, Object length, Object tagname, PNone access, PNone offset) {
170169
throw raise(PythonBuiltinClassType.OSError);
171170
}
172171

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
import com.oracle.graal.python.builtins.objects.socket.PSocket;
7272
import com.oracle.graal.python.builtins.objects.str.PString;
7373
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
74-
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
7574
import com.oracle.graal.python.nodes.ErrorMessages;
7675
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
7776
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -227,13 +226,13 @@ public void initialize(PythonCore core) {
227226
@GenerateNodeFactory
228227
public abstract static class SocketNode extends PythonBuiltinNode {
229228
@Specialization(guards = {"isNoValue(family)", "isNoValue(type)", "isNoValue(proto)", "isNoValue(fileno)"})
230-
Object socket(LazyPythonClass cls, @SuppressWarnings("unused") PNone family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto,
229+
Object socket(Object cls, @SuppressWarnings("unused") PNone family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto,
231230
@SuppressWarnings("unused") PNone fileno) {
232231
return createSocketInternal(cls, PSocket.AF_INET, PSocket.SOCK_STREAM, 0);
233232
}
234233

235234
@Specialization(guards = {"isNoValue(family)", "isNoValue(type)", "isNoValue(proto)", "!isNoValue(fileno)"})
236-
Object socket(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") PNone family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto, Object fileno,
235+
Object socket(VirtualFrame frame, Object cls, @SuppressWarnings("unused") PNone family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto, Object fileno,
237236
@Cached CastToJavaIntExactNode cast) {
238237
try {
239238
return createSocketInternal(frame, cls, -1, -1, -1, cast.execute(fileno));
@@ -243,7 +242,7 @@ Object socket(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused
243242
}
244243

245244
@Specialization(guards = {"!isNoValue(family)", "isNoValue(type)", "isNoValue(proto)", "isNoValue(fileno)"})
246-
Object socket(LazyPythonClass cls, Object family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno,
245+
Object socket(Object cls, Object family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno,
247246
@Cached CastToJavaIntExactNode cast) {
248247
try {
249248
return createSocketInternal(cls, cast.execute(family), PSocket.SOCK_STREAM, 0);
@@ -253,7 +252,7 @@ Object socket(LazyPythonClass cls, Object family, @SuppressWarnings("unused") PN
253252
}
254253

255254
@Specialization(guards = {"!isNoValue(family)", "!isNoValue(type)", "isNoValue(proto)", "isNoValue(fileno)"})
256-
Object socket(LazyPythonClass cls, Object family, Object type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno,
255+
Object socket(Object cls, Object family, Object type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno,
257256
@Cached CastToJavaIntExactNode cast) {
258257
try {
259258
return createSocketInternal(cls, cast.execute(family), cast.execute(type), 0);
@@ -263,7 +262,7 @@ Object socket(LazyPythonClass cls, Object family, Object type, @SuppressWarnings
263262
}
264263

265264
@Specialization(guards = {"!isNoValue(family)", "!isNoValue(type)", "!isNoValue(proto)", "isNoValue(fileno)"})
266-
Object socket(LazyPythonClass cls, Object family, Object type, Object proto, @SuppressWarnings("unused") PNone fileno,
265+
Object socket(Object cls, Object family, Object type, Object proto, @SuppressWarnings("unused") PNone fileno,
267266
@Cached CastToJavaIntExactNode cast) {
268267
try {
269268
return createSocketInternal(cls, cast.execute(family), cast.execute(type), cast.execute(proto));
@@ -273,7 +272,7 @@ Object socket(LazyPythonClass cls, Object family, Object type, Object proto, @Su
273272
}
274273

275274
@Specialization(guards = {"!isNoValue(family)", "!isNoValue(type)", "!isNoValue(proto)", "!isNoValue(fileno)"})
276-
Object socket(VirtualFrame frame, LazyPythonClass cls, Object family, Object type, Object proto, Object fileno,
275+
Object socket(VirtualFrame frame, Object cls, Object family, Object type, Object proto, Object fileno,
277276
@Cached CastToJavaIntExactNode cast) {
278277
try {
279278
return createSocketInternal(frame, cls, cast.execute(family), cast.execute(type), cast.execute(proto), cast.execute(fileno));
@@ -282,7 +281,7 @@ Object socket(VirtualFrame frame, LazyPythonClass cls, Object family, Object typ
282281
}
283282
}
284283

285-
private Object createSocketInternal(LazyPythonClass cls, int family, int type, int proto) {
284+
private Object createSocketInternal(Object cls, int family, int type, int proto) {
286285
if (getContext().getEnv().isNativeAccessAllowed()) {
287286
PSocket newSocket = factory().createSocket(cls, family, type, proto);
288287
int fd = getContext().getResources().openSocket(newSocket);
@@ -293,7 +292,7 @@ private Object createSocketInternal(LazyPythonClass cls, int family, int type, i
293292
}
294293
}
295294

296-
private Object createSocketInternal(VirtualFrame frame, LazyPythonClass cls, int family, int type, int proto, int fileno) {
295+
private Object createSocketInternal(VirtualFrame frame, Object cls, int family, int type, int proto, int fileno) {
297296
if (getContext().getEnv().isNativeAccessAllowed()) {
298297
PSocket oldSocket = getContext().getResources().getSocket(fileno);
299298
if (oldSocket == null) {

0 commit comments

Comments
 (0)