Fix repeated close

msimacek · msimacek · commit 33cbbd1f2aa6 · 2020-08-06T12:19:45.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java
@@ -472,7 +472,7 @@ Object close(VirtualFrame frame, PGenerator self,
             if (self.isRunning()) {
                 throw raise(ValueError, ErrorMessages.GENERATOR_ALREADY_EXECUTING);
             }
-            if (isStartedPorfile.profile(self.isStarted())) {
+            if (isStartedPorfile.profile(self.isStarted() && !self.isFinished())) {
                 PBaseException pythonException = factory().createBaseException(GeneratorExit);
                 // Pass it to the generator where it will be thrown by the last yield, the location
                 // will be filled there

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ Object close(VirtualFrame frame, PGenerator self,`
`472`	`472`	`if (self.isRunning()) {`
`473`	`473`	`throw raise(ValueError, ErrorMessages.GENERATOR_ALREADY_EXECUTING);`
`474`	`474`	`}`
`475`		`- if (isStartedPorfile.profile(self.isStarted())) {`
	`475`	`+ if (isStartedPorfile.profile(self.isStarted() && !self.isFinished())) {`
`476`	`476`	`PBaseException pythonException = factory().createBaseException(GeneratorExit);`
`477`	`477`	`// Pass it to the generator where it will be thrown by the last yield, the location`
`478`	`478`	`// will be filled there`