From 83d89ef43e2af1903b7bbc5b4f97d70971771d62 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 4 Dec 2023 17:03:35 +0000
Subject: [PATCH] x

---
 src/core/lib/channel/promise_based_filter.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 1236e4746f5..843429142b7 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -388,7 +388,7 @@ inline void InterceptClientInitialMetadata(
       [call_spine,
        call](ClientMetadataHandle md) -> absl::optional<ClientMetadataHandle> {
         auto return_md = call->OnClientInitialMetadata(*md);
-        if (return_md == nullptr) return md;
+        if (return_md == nullptr) return std::move(md);
         return call_spine->Cancel(std::move(return_md));
       });
 }
@@ -404,7 +404,7 @@ inline void InterceptClientInitialMetadata(
       [call_spine, call, channel](
           ClientMetadataHandle md) -> absl::optional<ClientMetadataHandle> {
         auto return_md = call->OnClientInitialMetadata(*md, channel);
-        if (return_md == nullptr) return md;
+        if (return_md == nullptr) return std::move(md);
         return call_spine->Cancel(std::move(return_md));
       });
 }
@@ -452,7 +452,7 @@ inline void InterceptServerInitialMetadata(
     Derived* channel, CallSpineInterface* call_spine) {
   GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerInitialMetadata);
   call_spine->server_initial_metadata().sender.InterceptAndMap(
-      [call](ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
+      [call](ServerMetadataHandle md) {
         call->OnServerInitialMetadata(*md);
         return md;
       });
@@ -468,7 +468,7 @@ inline void InterceptServerInitialMetadata(
       [call, call_spine](
           ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
         auto status = call->OnServerInitialMetadata(*md);
-        if (status.ok()) return md;
+        if (status.ok()) return std::move(md);
         return call_spine->Cancel(ServerMetadataFromStatus(status));
       });
 }
@@ -488,7 +488,7 @@ inline void InterceptServerTrailingMetadata(
     Derived* channel, CallSpineInterface* call_spine) {
   GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerTrailingMetadata);
   call_spine->server_trailing_metadata().sender.InterceptAndMap(
-      [call](ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
+      [call](ServerMetadataHandle md) {
         call->OnServerTrailingMetadata(*md);
         return md;
       });
@@ -503,7 +503,7 @@ inline void InterceptServerTrailingMetadata(
   call_spine->server_trailing_metadata().sender.InterceptAndMap(
       [call](ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
         auto status = call->OnServerTrailingMetadata(*md);
-        if (status.ok()) return md;
+        if (status.ok()) return std::move(md);
         return ServerMetadataFromStatus(status);
       });
 }