more useful vm.new_stop_iteration

youknowone · youknowone · commit f93b74144961 · 2021-10-03T03:36:08.000+09:00
diff --git a/vm/src/builtins/asyncgenerator.rs b/vm/src/builtins/asyncgenerator.rs
@@ -155,10 +155,7 @@ impl PyAsyncGenWrappedValue {
         match_class!(match val {
             val @ Self => {
                 ag.running_async.store(false);
-                Err(vm.new_exception(
-                    vm.ctx.exceptions.stop_iteration.clone(),
-                    vec![val.0.clone()],
-                ))
+                Err(vm.new_stop_iteration(Some(val.0.clone())))
             }
             val => Ok(val),
         })
@@ -307,7 +304,7 @@ impl PyAsyncGenAThrow {
                 }
                 if self.ag.inner.closed() {
                     self.state.store(AwaitableState::Closed);
-                    return Err(vm.new_exception_empty(vm.ctx.exceptions.stop_iteration.clone()));
+                    return Err(vm.new_stop_iteration(None));
                 }
                 if !vm.is_none(&val) {
                     return Err(vm.new_runtime_error(
@@ -398,7 +395,7 @@ impl PyAsyncGenAThrow {
             && (exc.isinstance(&vm.ctx.exceptions.stop_async_iteration)
                 || exc.isinstance(&vm.ctx.exceptions.generator_exit))
         {
-            vm.new_exception_empty(vm.ctx.exceptions.stop_iteration.clone())
+            vm.new_stop_iteration(None)
         } else {
             exc
         }
diff --git a/vm/src/protocol/iter.rs b/vm/src/protocol/iter.rs
@@ -166,10 +166,7 @@ impl IntoPyResult for PyIterReturn {
     fn into_pyresult(self, vm: &VirtualMachine) -> PyResult {
         match self {
             Self::Return(obj) => Ok(obj),
-            Self::StopIteration(v) => Err({
-                let args = if let Some(v) = v { vec![v] } else { Vec::new() };
-                vm.new_exception(vm.ctx.exceptions.stop_iteration.clone(), args)
-            }),
+            Self::StopIteration(v) => Err(vm.new_stop_iteration(v)),
         }
     }
 }
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -800,9 +800,13 @@ impl VirtualMachine {
         self.new_exception_msg(memory_error_type, msg)
     }
 
-    pub fn new_stop_iteration(&self) -> PyBaseExceptionRef {
-        let stop_iteration_type = self.ctx.exceptions.stop_iteration.clone();
-        self.new_exception_empty(stop_iteration_type)
+    pub fn new_stop_iteration(&self, value: Option<PyObjectRef>) -> PyBaseExceptionRef {
+        let args = if let Some(value) = value {
+            vec![value]
+        } else {
+            Vec::new()
+        };
+        self.new_exception(self.ctx.exceptions.stop_iteration.clone(), args)
     }
 
     #[track_caller]

Original file line number	Diff line number	Diff line change
`@@ -155,10 +155,7 @@ impl PyAsyncGenWrappedValue {`
`155`	`155`	`match_class!(match val {`
`156`	`156`	`val @ Self => {`
`157`	`157`	`ag.running_async.store(false);`
`158`		`- Err(vm.new_exception(`
`159`		`- vm.ctx.exceptions.stop_iteration.clone(),`
`160`		`- vec![val.0.clone()],`
`161`		`- ))`
	`158`	`+ Err(vm.new_stop_iteration(Some(val.0.clone())))`
`162`	`159`	`}`
`163`	`160`	`val => Ok(val),`
`164`	`161`	`})`
`@@ -307,7 +304,7 @@ impl PyAsyncGenAThrow {`
`307`	`304`	`}`
`308`	`305`	`if self.ag.inner.closed() {`
`309`	`306`	`self.state.store(AwaitableState::Closed);`
`310`		`- return Err(vm.new_exception_empty(vm.ctx.exceptions.stop_iteration.clone()));`
	`307`	`+ return Err(vm.new_stop_iteration(None));`
`311`	`308`	`}`
`312`	`309`	`if !vm.is_none(&val) {`
`313`	`310`	`return Err(vm.new_runtime_error(`
`@@ -398,7 +395,7 @@ impl PyAsyncGenAThrow {`
`398`	`395`	`&& (exc.isinstance(&vm.ctx.exceptions.stop_async_iteration)`
`399`	`396`	`\|\| exc.isinstance(&vm.ctx.exceptions.generator_exit))`
`400`	`397`	`{`
`401`		`- vm.new_exception_empty(vm.ctx.exceptions.stop_iteration.clone())`
	`398`	`+ vm.new_stop_iteration(None)`
`402`	`399`	`} else {`
`403`	`400`	`exc`
`404`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,10 +166,7 @@ impl IntoPyResult for PyIterReturn {`
`166`	`166`	`fn into_pyresult(self, vm: &VirtualMachine) -> PyResult {`
`167`	`167`	`match self {`
`168`	`168`	`Self::Return(obj) => Ok(obj),`
`169`		`- Self::StopIteration(v) => Err({`
`170`		`- let args = if let Some(v) = v { vec![v] } else { Vec::new() };`
`171`		`- vm.new_exception(vm.ctx.exceptions.stop_iteration.clone(), args)`
`172`		`- }),`
	`169`	`+ Self::StopIteration(v) => Err(vm.new_stop_iteration(v)),`
`173`	`170`	`}`
`174`	`171`	`}`
`175`	`172`	`}`