@@ -180,18 +180,17 @@ protected static LookupAndCallBinaryNode createCallReadNode() {
180
180
@ Specialization
181
181
Object doit (VirtualFrame frame , Object file ,
182
182
@ Cached ("createCallReadNode()" ) LookupAndCallBinaryNode callNode ,
183
- @ CachedLibrary (limit = "3" ) PythonBufferAcquireLibrary bufferLib ,
184
- @ Cached PRaiseNode raise ) {
183
+ @ CachedLibrary (limit = "3" ) PythonBufferAcquireLibrary bufferLib ) {
185
184
Object buffer = callNode .executeObject (frame , file , 0 );
186
185
if (!bufferLib .hasBuffer (buffer )) {
187
186
throw raise (PythonBuiltinClassType .TypeError , "file.read() returned not bytes but %p" , buffer );
188
187
}
189
188
try {
190
189
return Marshal .loadFile (file );
191
190
} 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 ());
193
192
} catch (Marshal .MarshalError me ) {
194
- throw raise . raise (me .type , me .message , me .arguments );
193
+ throw raise (me .type , me .message , me .arguments );
195
194
}
196
195
}
197
196
}
@@ -203,14 +202,13 @@ abstract static class LoadsNode extends PythonUnaryClinicBuiltinNode {
203
202
204
203
@ Specialization (limit = "3" )
205
204
Object doit (VirtualFrame frame , Object buffer ,
206
- @ CachedLibrary ("buffer" ) PythonBufferAccessLibrary bufferLib ,
207
- @ Cached PRaiseNode raise ) {
205
+ @ CachedLibrary ("buffer" ) PythonBufferAccessLibrary bufferLib ) {
208
206
try {
209
207
return Marshal .load (bufferLib .getInternalOrCopiedByteArray (buffer ), bufferLib .getBufferLength (buffer ));
210
208
} 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 ());
212
210
} catch (Marshal .MarshalError me ) {
213
- throw raise . raise (me .type , me .message , me .arguments );
211
+ throw raise (me .type , me .message , me .arguments );
214
212
} finally {
215
213
bufferLib .release (buffer , frame , this );
216
214
}
0 commit comments