grpc 1.52.0.pre2 → 1.53.0.pre2

data/src/core/lib/iomgr/tcp_server_windows.cc

@@ -228,7 +228,7 @@ static grpc_error_handle prepare_socket(SOCKET sock,
 failure:
   GPR_ASSERT(!error.ok());
   auto addr_uri = grpc_sockaddr_to_uri(addr);
-  grpc_error_set_int(
+  error = grpc_error_set_int(
       grpc_error_set_str(
           GRPC_ERROR_CREATE_REFERENCING("Failed to prepare server socket",
                                         &error, 1),
@@ -412,11 +412,9 @@ static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, SOCKET sock,
                &AcceptEx, sizeof(AcceptEx), &ioctl_num_bytes, NULL, NULL);
 
   if (status != 0) {
-    char* utf8_message = gpr_format_message(WSAGetLastError());
-    gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message);
-    gpr_free(utf8_message);
+    error = GRPC_WSA_ERROR(WSAGetLastError(), "AcceptEx pointer retrieval");
     closesocket(sock);
-    return absl::OkStatus();
+    return error;
   }
 
   error = prepare_socket(sock, addr, &port);
@@ -458,7 +456,6 @@ static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s,
   grpc_resolved_address addr6_v4mapped;
   grpc_resolved_address wildcard;
   grpc_resolved_address* allocated_addr = NULL;
-  grpc_resolved_address sockname_temp;
   unsigned port_index = 0;
   grpc_error_handle error;
 
@@ -470,6 +467,7 @@ static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s,
   // as some previously created listener.
   if (grpc_sockaddr_get_port(addr) == 0) {
     for (sp = s->head; sp; sp = sp->next) {
+      grpc_resolved_address sockname_temp;
       int sockname_temp_len = sizeof(struct sockaddr_storage);
       if (0 == getsockname(sp->socket->socket,
                            (grpc_sockaddr*)sockname_temp.addr,

data/src/core/lib/iomgr/tcp_windows.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_TCP_WINDOWS_H
-#define GRPC_CORE_LIB_IOMGR_TCP_WINDOWS_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_WINDOWS_H
+#define GRPC_SRC_CORE_LIB_IOMGR_TCP_WINDOWS_H
 //
 // Low level TCP "bottom half" implementation, for use by transports built on
 // top of a TCP connection.
@@ -49,4 +49,4 @@ grpc_error_handle grpc_tcp_set_non_block(SOCKET sock);
 
 #endif
 
-#endif  // GRPC_CORE_LIB_IOMGR_TCP_WINDOWS_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_TCP_WINDOWS_H

data/src/core/lib/iomgr/timer.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_TIMER_H
-#define GRPC_CORE_LIB_IOMGR_TIMER_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_H
+#define GRPC_SRC_CORE_LIB_IOMGR_TIMER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -133,4 +133,4 @@ void grpc_kick_poller(void);
 // Sets the timer implementation
 void grpc_set_timer_impl(grpc_timer_vtable* vtable);
 
-#endif  // GRPC_CORE_LIB_IOMGR_TIMER_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_TIMER_H

data/src/core/lib/iomgr/timer_generic.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H
-#define GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_GENERIC_H
+#define GRPC_SRC_CORE_LIB_IOMGR_TIMER_GENERIC_H
 
 #include <grpc/support/port_platform.h>
 
@@ -37,4 +37,4 @@ struct grpc_timer {
 #endif
 };
 
-#endif  // GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_TIMER_GENERIC_H

data/src/core/lib/iomgr/timer_heap.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_TIMER_HEAP_H
-#define GRPC_CORE_LIB_IOMGR_TIMER_HEAP_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_HEAP_H
+#define GRPC_SRC_CORE_LIB_IOMGR_TIMER_HEAP_H
 
 #include <grpc/support/port_platform.h>
 
@@ -40,4 +40,4 @@ void grpc_timer_heap_pop(grpc_timer_heap* heap);
 
 bool grpc_timer_heap_is_empty(grpc_timer_heap* heap);
 
-#endif  // GRPC_CORE_LIB_IOMGR_TIMER_HEAP_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_TIMER_HEAP_H

data/src/core/lib/iomgr/timer_manager.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_TIMER_MANAGER_H
-#define GRPC_CORE_LIB_IOMGR_TIMER_MANAGER_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H
+#define GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -38,4 +38,4 @@ void grpc_timer_manager_tick(void);
 // get global counter that tracks timer wakeups
 uint64_t grpc_timer_manager_get_wakeups_testonly(void);
 
-#endif  // GRPC_CORE_LIB_IOMGR_TIMER_MANAGER_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H

data/src/core/lib/iomgr/unix_sockets_posix.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
-#define GRPC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
+#define GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
 
 #include <grpc/support/port_platform.h>
 
@@ -43,4 +43,4 @@ int grpc_is_unix_socket(const grpc_resolved_address* resolved_addr);
 void grpc_unlink_if_unix_domain_socket(
     const grpc_resolved_address* resolved_addr);
 
-#endif  // GRPC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H

data/src/core/lib/iomgr/wakeup_fd_pipe.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H
-#define GRPC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H
+#define GRPC_SRC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -25,4 +25,4 @@
 
 extern const grpc_wakeup_fd_vtable grpc_pipe_wakeup_fd_vtable;
 
-#endif  // GRPC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H

data/src/core/lib/iomgr/wakeup_fd_posix.h

@@ -44,8 +44,8 @@
 // 2. If the polling thread was awakened by a wakeup_fd event, call
 //    grpc_wakeup_fd_consume_wakeup() on it.
 //
-#ifndef GRPC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H
-#define GRPC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H
+#define GRPC_SRC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H
 
 #include <grpc/support/port_platform.h>
 
@@ -93,4 +93,4 @@ void grpc_wakeup_fd_destroy(grpc_wakeup_fd* fd_info);
 // wakeup_fd_nospecial.c if no such implementation exists.
 extern const grpc_wakeup_fd_vtable grpc_specialized_wakeup_fd_vtable;
 
-#endif  // GRPC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H

data/src/core/lib/json/json.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_JSON_JSON_H
-#define GRPC_CORE_LIB_JSON_JSON_H
+#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_H
+#define GRPC_SRC_CORE_LIB_JSON_JSON_H
 
 #include <grpc/support/port_platform.h>
 
@@ -243,4 +243,4 @@ class Json {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_JSON_JSON_H
+#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_H

data/src/core/lib/json/json_args.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_JSON_JSON_ARGS_H
-#define GRPC_CORE_LIB_JSON_JSON_ARGS_H
+#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
+#define GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -31,4 +31,4 @@ class JsonArgs {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_JSON_JSON_ARGS_H
+#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H

data/src/core/lib/json/json_channel_args.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
-#define GRPC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
+#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
+#define GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -39,4 +39,4 @@ class JsonChannelArgs : public JsonArgs {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
+#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H

data/src/core/lib/json/json_object_loader.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
-#define GRPC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
+#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
+#define GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -631,4 +631,4 @@ absl::optional<T> LoadJsonObjectField(const Json::Object& json,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
+#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H

data/src/core/lib/json/json_reader.cc

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 
 #include <algorithm>
+#include <initializer_list>
 #include <map>
 #include <string>
 #include <utility>

data/src/core/lib/json/json_util.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_JSON_JSON_UTIL_H
-#define GRPC_CORE_LIB_JSON_JSON_UTIL_H
+#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
+#define GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -160,4 +160,4 @@ bool ParseJsonObjectFieldAsDuration(const Json::Object& object,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_JSON_JSON_UTIL_H
+#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H

data/src/core/lib/load_balancing/lb_policy.cc

@@ -53,6 +53,15 @@ void LoadBalancingPolicy::Orphan() {
   Unref(DEBUG_LOCATION, "Orphan");
 }
 
+//
+// LoadBalancingPolicy::SubchannelPicker
+//
+
+LoadBalancingPolicy::SubchannelPicker::SubchannelPicker()
+    : DualRefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_trace_lb_policy_refcount)
+                         ? "SubchannelPicker"
+                         : nullptr) {}
+
 //
 // LoadBalancingPolicy::QueuePicker
 //

data/src/core/lib/load_balancing/lb_policy.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H
-#define GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H
+#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H
+#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -40,6 +40,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/dual_ref_counted.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -176,6 +177,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
     /// implementation does not take ownership, so any data that needs to be
     /// used after returning must be copied.
     struct FinishArgs {
+      absl::string_view peer_address;
       absl::Status status;
       MetadataInterface* trailing_metadata;
       BackendMetricAccessor* backend_metric_accessor;
@@ -256,11 +258,13 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
   /// Currently, pickers are always accessed from within the
   /// client_channel data plane mutex, so they do not have to be
   /// thread-safe.
-  class SubchannelPicker : public RefCounted<SubchannelPicker> {
+  class SubchannelPicker : public DualRefCounted<SubchannelPicker> {
    public:
-    SubchannelPicker() = default;
+    SubchannelPicker();
 
     virtual PickResult Pick(PickArgs args) = 0;
+
+    void Orphan() override {}
   };
 
   /// A proxy object implemented by the client channel and used by the
@@ -435,4 +439,4 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H
+#endif  // GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_H

data/src/core/lib/load_balancing/lb_policy_factory.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H
-#define GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H
+#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H
+#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -46,4 +46,4 @@ class LoadBalancingPolicyFactory {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H
+#endif  // GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_FACTORY_H

data/src/core/lib/load_balancing/lb_policy_registry.cc

@@ -19,6 +19,7 @@
 #include "src/core/lib/load_balancing/lb_policy_registry.h"
 
 #include <algorithm>
+#include <initializer_list>
 #include <map>
 #include <string>
 #include <utility>

data/src/core/lib/load_balancing/lb_policy_registry.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H
-#define GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H
+#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H
+#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -79,4 +79,4 @@ class LoadBalancingPolicyRegistry {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H
+#endif  // GRPC_SRC_CORE_LIB_LOAD_BALANCING_LB_POLICY_REGISTRY_H

data/src/core/lib/load_balancing/subchannel_interface.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
-#define GRPC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
+#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
+#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -26,14 +26,14 @@
 
 #include <grpc/impl/connectivity_state.h>
 
-#include "src/core/lib/gprpp/ref_counted.h"
+#include "src/core/lib/gprpp/dual_ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 
 namespace grpc_core {
 
 // The interface for subchannels that is exposed to LB policy implementations.
-class SubchannelInterface : public RefCounted<SubchannelInterface> {
+class SubchannelInterface : public DualRefCounted<SubchannelInterface> {
  public:
   class ConnectivityStateWatcherInterface {
    public:
@@ -59,10 +59,12 @@ class SubchannelInterface : public RefCounted<SubchannelInterface> {
   };
 
   explicit SubchannelInterface(const char* trace = nullptr)
-      : RefCounted<SubchannelInterface>(trace) {}
+      : DualRefCounted<SubchannelInterface>(trace) {}
 
   ~SubchannelInterface() override = default;
 
+  void Orphan() override {}
+
   // Starts watching the subchannel's connectivity state.
   // The first callback to the watcher will be delivered ~immediately.
   // Subsequent callbacks will be delivered as the subchannel's state
@@ -130,4 +132,4 @@ class DelegatingSubchannel : public SubchannelInterface {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
+#endif  // GRPC_SRC_CORE_LIB_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H

data/src/core/lib/matchers/matchers.cc

@@ -16,6 +16,7 @@
 
 #include "src/core/lib/matchers/matchers.h"
 
+#include <initializer_list>
 #include <utility>
 
 #include "absl/status/status.h"

data/src/core/lib/matchers/matchers.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_MATCHERS_MATCHERS_H
-#define GRPC_CORE_LIB_MATCHERS_MATCHERS_H
+#ifndef GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H
+#define GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -159,4 +159,4 @@ class HeaderMatcher {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_MATCHERS_MATCHERS_H
+#endif  // GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H

data/src/core/lib/promise/activity.cc

@@ -18,6 +18,8 @@
 
 #include <stddef.h>
 
+#include <initializer_list>
+
 #include "absl/strings/str_format.h"
 
 #include "src/core/lib/gprpp/atomic_utils.h"
@@ -34,7 +36,7 @@ namespace promise_detail {
 ///////////////////////////////////////////////////////////////////////////////
 // HELPER TYPES
 
-std::string Unwakeable::ActivityDebugTag() const { return "<unknown>"; }
+std::string Unwakeable::ActivityDebugTag(void*) const { return "<unknown>"; }
 
 // Weak handle to an Activity.
 // Handle can persist while Activity goes away.
@@ -56,7 +58,7 @@ class FreestandingActivity::Handle final : public Wakeable {
 
   // Activity needs to wake up (if it still exists!) - wake it up, and drop the
   // ref that was kept for this handle.
-  void Wakeup() override ABSL_LOCKS_EXCLUDED(mu_) {
+  void Wakeup(void*) override ABSL_LOCKS_EXCLUDED(mu_) {
     mu_.Lock();
     // Note that activity refcount can drop to zero, but we could win the lock
     // against DropActivity, so we need to only increase activities refcount if
@@ -66,7 +68,7 @@ class FreestandingActivity::Handle final : public Wakeable {
       mu_.Unlock();
       // Activity still exists and we have a reference: wake it up, which will
       // drop the ref.
-      activity->Wakeup();
+      activity->Wakeup(nullptr);
     } else {
       // Could not get the activity - it's either gone or going. No need to wake
       // it up!
@@ -76,9 +78,9 @@ class FreestandingActivity::Handle final : public Wakeable {
     Unref();
   }
 
-  void Drop() override { Unref(); }
+  void Drop(void*) override { Unref(); }
 
-  std::string ActivityDebugTag() const override {
+  std::string ActivityDebugTag(void*) const override {
     MutexLock lock(&mu_);
     return activity_ == nullptr ? "<unknown>" : activity_->DebugTag();
   }
@@ -122,7 +124,7 @@ void FreestandingActivity::DropHandle() {
 
 Waker FreestandingActivity::MakeNonOwningWaker() {
   mu_.AssertHeld();
-  return Waker(RefHandle());
+  return Waker(RefHandle(), nullptr);
 }
 
 }  // namespace promise_detail