3030import static com .oracle .graal .python .nodes .SpecialMethodNames .__REPR__ ;
3131import static com .oracle .graal .python .runtime .exception .PythonErrorType .StopIteration ;
3232import static com .oracle .graal .python .runtime .exception .PythonErrorType .TypeError ;
33+ import static com .oracle .graal .python .runtime .exception .PythonErrorType .ValueError ;
3334
3435import java .util .List ;
3536
@@ -113,13 +114,16 @@ private static Object[] prepareArguments(PGenerator self) {
113114 return arguments ;
114115 }
115116
116- private static Object resumeGenerator (PGenerator self ) {
117+ private static Object resumeGenerator (PGenerator self , Object sendValue ) {
117118 try {
119+ self .setRunning (true );
120+ PArguments .setSpecialArgument (self .getArguments (), sendValue );
118121 return self .getCurrentCallTarget ().call (prepareArguments (self ));
119122 } catch (PException e ) {
120123 self .markAsFinished ();
121124 throw e ;
122125 } finally {
126+ self .setRunning (false );
123127 self .setNextCallTarget ();
124128 PArguments .setSpecialArgument (self .getArguments (), null );
125129 }
@@ -159,32 +163,46 @@ protected static boolean sameCallTarget(RootCallTarget target1, CallTarget targe
159163
160164 @ Specialization (guards = "sameCallTarget(self.getCurrentCallTarget(), call.getCallTarget())" , limit = "getCallSiteInlineCacheMaxDepth()" )
161165 public Object nextCached (VirtualFrame frame , PGenerator self ,
162- @ Cached ("createDirectCall(self.getCurrentCallTarget())" ) CallTargetInvokeNode call ) {
166+ @ Cached ("createDirectCall(self.getCurrentCallTarget())" ) CallTargetInvokeNode call ,
167+ @ Cached BranchProfile alreadyRunning ) {
163168 if (self .isFinished ()) {
164169 throw raise (StopIteration );
165170 }
171+ if (self .isRunning ()) {
172+ alreadyRunning .enter ();
173+ throw raise (ValueError , ErrorMessages .GENERATOR_ALREADY_EXECUTING );
174+ }
166175 try {
176+ self .setRunning (true );
167177 return call .execute (frame , null , null , prepareArguments (self ));
168178 } catch (PException e ) {
169179 self .markAsFinished ();
170180 throw e ;
171181 } finally {
182+ self .setRunning (false );
172183 self .setNextCallTarget ();
173184 }
174185 }
175186
176187 @ Specialization (replaces = "nextCached" )
177188 public Object next (VirtualFrame frame , PGenerator self ,
178- @ Cached ("createIndirectCall()" ) GenericInvokeNode call ) {
189+ @ Cached ("createIndirectCall()" ) GenericInvokeNode call ,
190+ @ Cached BranchProfile alreadyRunning ) {
179191 if (self .isFinished ()) {
180192 throw raise (StopIteration );
181193 }
194+ if (self .isRunning ()) {
195+ alreadyRunning .enter ();
196+ throw raise (ValueError , ErrorMessages .GENERATOR_ALREADY_EXECUTING );
197+ }
182198 try {
199+ self .setRunning (true );
183200 return call .execute (frame , self .getCurrentCallTarget (), prepareArguments (self ));
184201 } catch (PException e ) {
185202 self .markAsFinished ();
186203 throw e ;
187204 } finally {
205+ self .setRunning (false );
188206 self .setNextCallTarget ();
189207 }
190208 }
@@ -195,9 +213,13 @@ public Object next(VirtualFrame frame, PGenerator self,
195213 public abstract static class SendNode extends PythonBuiltinNode {
196214
197215 @ Specialization
198- public Object send (PGenerator self , Object value ) {
199- PArguments .setSpecialArgument (self .getArguments (), value );
200- return resumeGenerator (self );
216+ public Object send (PGenerator self , Object value ,
217+ @ Cached BranchProfile alreadyRunning ) {
218+ if (self .isRunning ()) {
219+ alreadyRunning .enter ();
220+ throw raise (ValueError , ErrorMessages .GENERATOR_ALREADY_EXECUTING );
221+ }
222+ return resumeGenerator (self , value );
201223 }
202224 }
203225
@@ -308,14 +330,24 @@ private void checkExceptionClass(LazyPythonClass type) {
308330
309331 @ Specialization
310332 Object sendThrow (VirtualFrame frame , PGenerator self , Object typ , Object val , @ SuppressWarnings ("unused" ) PNone tb ,
311- @ Cached PrepareExceptionNode prepareExceptionNode ) {
333+ @ Cached PrepareExceptionNode prepareExceptionNode ,
334+ @ Cached BranchProfile alreadyRunning ) {
335+ if (self .isRunning ()) {
336+ alreadyRunning .enter ();
337+ throw raise (ValueError , ErrorMessages .GENERATOR_ALREADY_EXECUTING );
338+ }
312339 PBaseException instance = prepareExceptionNode .execute (frame , typ , val );
313340 return doThrow (self , instance );
314341 }
315342
316343 @ Specialization
317344 Object sendThrow (VirtualFrame frame , PGenerator self , Object typ , Object val , PTraceback tb ,
318- @ Cached PrepareExceptionNode prepareExceptionNode ) {
345+ @ Cached PrepareExceptionNode prepareExceptionNode ,
346+ @ Cached BranchProfile alreadyRunning ) {
347+ if (self .isRunning ()) {
348+ alreadyRunning .enter ();
349+ throw raise (ValueError , ErrorMessages .GENERATOR_ALREADY_EXECUTING );
350+ }
319351 PBaseException instance = prepareExceptionNode .execute (frame , typ , val );
320352 instance .setTraceback (tb );
321353 return doThrow (self , instance );
@@ -328,8 +360,7 @@ private Object doThrow(PGenerator self, PBaseException instance) {
328360 // Pass it to the generator where it will be thrown by the last yield, the location
329361 // will be filled there
330362 PException pException = PException .fromObject (instance , null );
331- PArguments .setSpecialArgument (self .getArguments (), pException );
332- return resumeGenerator (self );
363+ return resumeGenerator (self , pException );
333364 } else {
334365 // Unstarted generator, we cannot pass the exception into the generator as there is
335366 // nothing that would handle it.
@@ -373,7 +404,7 @@ private GetTracebackNode ensureGetTracebackNode() {
373404
374405 @ Builtin (name = "gi_code" , minNumOfPositionalArgs = 1 , isGetter = true )
375406 @ GenerateNodeFactory
376- public abstract static class GetCodeNode extends PythonBuiltinNode {
407+ public abstract static class GetCodeNode extends PythonUnaryBuiltinNode {
377408 @ Specialization
378409 Object getCode (PGenerator self ,
379410 @ Cached ("createBinaryProfile()" ) ConditionProfile hasCodeProfile ) {
@@ -386,6 +417,15 @@ Object getCode(PGenerator self,
386417 }
387418 }
388419
420+ @ Builtin (name = "gi_running" , minNumOfPositionalArgs = 1 , isGetter = true )
421+ @ GenerateNodeFactory
422+ public abstract static class GetRunningNode extends PythonUnaryBuiltinNode {
423+ @ Specialization
424+ static Object getRunning (PGenerator self ) {
425+ return self .isRunning ();
426+ }
427+ }
428+
389429 @ Builtin (name = __REPR__ , minNumOfPositionalArgs = 1 )
390430 @ GenerateNodeFactory
391431 abstract static class ReprNode extends PythonUnaryBuiltinNode {
0 commit comments