From 6f2158b432bdaecc3bcc12f8611269728b6257e4 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 1 Dec 2023 23:45:24 +0000
Subject: [PATCH] remove PromiseBasedLoadBalancedCall dtor -- already handled
 via OnCancel()

---
 src/core/ext/filters/client_channel/client_channel.cc | 11 -----------
 src/core/ext/filters/client_channel/client_channel.h  |  2 --
 2 files changed, 13 deletions(-)

diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index ecc74575301..197173aa7e0 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -3487,17 +3487,6 @@ ClientChannel::PromiseBasedLoadBalancedCall::PromiseBasedLoadBalancedCall(
     : LoadBalancedCall(chand, GetContext<grpc_call_context_element>(),
                        std::move(on_commit), is_transparent_retry) {}
 
-ClientChannel::PromiseBasedLoadBalancedCall::~PromiseBasedLoadBalancedCall() {
-  if (was_queued_ && client_initial_metadata_ != nullptr) {
-    MutexLock lock(&chand()->lb_mu_);
-    Commit();
-    // Remove pick from list of queued picks.
-    RemoveCallFromLbQueuedCallsLocked();
-    // Remove from queued picks list.
-    chand()->lb_queued_calls_.erase(this);
-  }
-}
-
 ArenaPromise<ServerMetadataHandle>
 ClientChannel::PromiseBasedLoadBalancedCall::MakeCallPromise(
     CallArgs call_args, OrphanablePtr<PromiseBasedLoadBalancedCall> lb_call) {
diff --git a/src/core/ext/filters/client_channel/client_channel.h b/src/core/ext/filters/client_channel/client_channel.h
index f1b7a1b9d19..f54c5db4669 100644
--- a/src/core/ext/filters/client_channel/client_channel.h
+++ b/src/core/ext/filters/client_channel/client_channel.h
@@ -611,8 +611,6 @@ class ClientChannel::PromiseBasedLoadBalancedCall
                                absl::AnyInvocable<void()> on_commit,
                                bool is_transparent_retry);
 
-  ~PromiseBasedLoadBalancedCall() override;
-
   ArenaPromise<ServerMetadataHandle> MakeCallPromise(
       CallArgs call_args, OrphanablePtr<PromiseBasedLoadBalancedCall> lb_call);