Skip to content

Commit e500a4b

Browse files
committed
Remove superfluously cached PRaiseNodes in MarshalModuleBuiltins.
1 parent 1c3d8e9 commit e500a4b

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,17 @@ protected static LookupAndCallBinaryNode createCallReadNode() {
180180
@Specialization
181181
Object doit(VirtualFrame frame, Object file,
182182
@Cached("createCallReadNode()") LookupAndCallBinaryNode callNode,
183-
@CachedLibrary(limit = "3") PythonBufferAcquireLibrary bufferLib,
184-
@Cached PRaiseNode raise) {
183+
@CachedLibrary(limit = "3") PythonBufferAcquireLibrary bufferLib) {
185184
Object buffer = callNode.executeObject(frame, file, 0);
186185
if (!bufferLib.hasBuffer(buffer)) {
187186
throw raise(PythonBuiltinClassType.TypeError, "file.read() returned not bytes but %p", buffer);
188187
}
189188
try {
190189
return Marshal.loadFile(file);
191190
} catch (NumberFormatException e) {
192-
throw raise.raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
191+
throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
193192
} catch (Marshal.MarshalError me) {
194-
throw raise.raise(me.type, me.message, me.arguments);
193+
throw raise(me.type, me.message, me.arguments);
195194
}
196195
}
197196
}
@@ -203,14 +202,13 @@ abstract static class LoadsNode extends PythonUnaryClinicBuiltinNode {
203202

204203
@Specialization(limit = "3")
205204
Object doit(VirtualFrame frame, Object buffer,
206-
@CachedLibrary("buffer") PythonBufferAccessLibrary bufferLib,
207-
@Cached PRaiseNode raise) {
205+
@CachedLibrary("buffer") PythonBufferAccessLibrary bufferLib) {
208206
try {
209207
return Marshal.load(bufferLib.getInternalOrCopiedByteArray(buffer), bufferLib.getBufferLength(buffer));
210208
} catch (NumberFormatException e) {
211-
throw raise.raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
209+
throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
212210
} catch (Marshal.MarshalError me) {
213-
throw raise.raise(me.type, me.message, me.arguments);
211+
throw raise(me.type, me.message, me.arguments);
214212
} finally {
215213
bufferLib.release(buffer, frame, this);
216214
}

0 commit comments

Comments
 (0)