Don't clear GeneratorExit in athrow().send()

Summary: This functionality was changed in python/cpython#7467.

Based on Facebook D27940847

Author: wmeehan

library/builtins_test.py

@@ -1615,7 +1615,8 @@ async def f():
 
         self._assertOpIterState(op_iter, "_STATE_CLOSED")
 
-    def test_send_state_init_arg_is_none_generator_raises_generator_exit_raises_stop_iteration_state_closed(  # noqa: B950
+    @supports_38_feature
+    def test_send_state_init_arg_is_none_generator_propagates_generator_exit(
         self,
     ):
         async def f():
@@ -1624,11 +1625,8 @@ async def f():
         # Make athrow op_iter
         op_iter = f().athrow(GeneratorExit)
 
-        with self.assertRaises(StopIteration) as exc:
+        with self.assertRaises(GeneratorExit):
             op_iter.send(None)
-        self.assertIsNone(exc.exception.value)
-
-        self._assertOpIterState(op_iter, "_STATE_CLOSED")
 
     def test_send_state_init_arg_is_none_generator_yields_raises_stop_iteration_with_value_state_iter(  # noqa: B950
         self,

runtime/generator-builtins.cpp

@@ -434,6 +434,7 @@ static RawObject asyncGenAcloseSend(Thread* thread, RawObject raw_self_obj,
                                     RawObject send_value_raw) {
   HandleScope scope(thread);
   Object self_obj(&scope, raw_self_obj);
+  Object send_value(&scope, send_value_raw);
   if (!self_obj.isAsyncGeneratorAclose()) {
     return thread->raiseWithFmt(LayoutId::kTypeError,
                                 "Must be called with an async_generator_aclose "
@@ -454,7 +455,6 @@ static RawObject asyncGenAcloseSend(Thread* thread, RawObject raw_self_obj,
   // to make progress through async-like yields.
   Object res(&scope, NoneType::object());
   AsyncGenerator generator(&scope, self.generator());
-  Object send_value(&scope, send_value_raw);
   if (state == AsyncGeneratorOpIterBase::State::Init) {
     if (!send_value.isNoneType()) {
       return thread->raiseWithFmt(
@@ -586,6 +586,7 @@ static RawObject asyncGenAsendSend(Thread* thread, RawObject raw_self_obj,
                                    RawObject send_value_raw) {
   HandleScope scope(thread);
   Object self_obj(&scope, raw_self_obj);
+  Object send_value(&scope, send_value_raw);
   if (!self_obj.isAsyncGeneratorAsend()) {
     return thread->raiseWithFmt(LayoutId::kTypeError,
                                 "Must be called with an async_generator_asend "
@@ -601,7 +602,6 @@ static RawObject asyncGenAsendSend(Thread* thread, RawObject raw_self_obj,
   }
   // Only use primed value for initial send, and only if no other specific value
   // is provided.
-  Object send_value(&scope, send_value_raw);
   if (state == AsyncGeneratorOpIterBase::State::Init) {
     if (send_value.isNoneType()) {
       send_value = self.value();
@@ -710,6 +710,7 @@ static RawObject asyncGenAthrowSend(Thread* thread, RawObject raw_self_obj,
                                     RawObject send_value_raw) {
   HandleScope scope(thread);
   Object self_obj(&scope, raw_self_obj);
+  Object send_value(&scope, send_value_raw);
   if (!self_obj.isAsyncGeneratorAthrow()) {
     return thread->raiseWithFmt(LayoutId::kTypeError,
                                 "Must be called with an async_generator_athrow "
@@ -730,7 +731,6 @@ static RawObject asyncGenAthrowSend(Thread* thread, RawObject raw_self_obj,
   // through async-like yields.
   Object res(&scope, NoneType::object());
   AsyncGenerator generator(&scope, self.generator());
-  Object send_value(&scope, send_value_raw);
   if (state == AsyncGeneratorOpIterBase::State::Init) {
     if (!send_value.isNoneType()) {
       return thread->raiseWithFmt(
@@ -747,15 +747,11 @@ static RawObject asyncGenAthrowSend(Thread* thread, RawObject raw_self_obj,
     // Handle StopAsyncIteration and GeneratorExit exceptions raised here.
     // Other exceptions are handled further down.
     if (res.isErrorException()) {
-      if (thread->pendingExceptionMatches(LayoutId::kStopAsyncIteration)) {
+      if (thread->pendingExceptionMatches(LayoutId::kStopAsyncIteration) ||
+          thread->pendingExceptionMatches(LayoutId::kGeneratorExit)) {
         self.setState(AsyncGeneratorOpIterBase::State::Closed);
         return *res;
       }
-      if (thread->pendingExceptionMatches(LayoutId::kGeneratorExit)) {
-        self.setState(AsyncGeneratorOpIterBase::State::Closed);
-        thread->clearPendingException();
-        return thread->raiseStopIteration();
-      }
     }
   } else {
     DCHECK(state == AsyncGeneratorOpIterBase::State::Iter, "Unexpected state");