01-arcadia.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. --- a/src/core/lib/surface/call.cc
  2. +++ b/src/core/lib/surface/call.cc
  3. @@ -97,6 +97,8 @@
  4. #include "src/core/lib/transport/metadata_batch.h"
  5. #include "src/core/lib/transport/transport.h"
  6. +#include <util/system/yassert.h>
  7. +
  8. grpc_core::TraceFlag grpc_call_error_trace(false, "call_error");
  9. grpc_core::TraceFlag grpc_compression_trace(false, "compression");
  10. grpc_core::TraceFlag grpc_call_trace(false, "call");
  11. @@ -1729,7 +1731,7 @@
  12. InternalRef("completion");
  13. if (!is_notify_tag_closure) {
  14. - GPR_ASSERT(grpc_cq_begin_op(cq_, notify_tag));
  15. + Y_ABORT_UNLESS(grpc_cq_begin_op(cq_, notify_tag));
  16. }
  17. bctl->set_pending_ops(pending_ops);
  18. --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
  19. +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
  20. @@ -21,6 +21,7 @@
  21. #include <inttypes.h>
  22. #include <string.h>
  23. +#include <util/system/compiler.h> // Y_NO_SANITIZE
  24. #include <memory>
  25. #include <util/generic/string.h>
  26. @@ -360,7 +361,7 @@
  27. SubchannelList<SubchannelListType, SubchannelDataType>::SubchannelList(
  28. LoadBalancingPolicy* policy, const char* tracer,
  29. ServerAddressList addresses,
  30. - LoadBalancingPolicy::ChannelControlHelper* helper, const ChannelArgs& args)
  31. + LoadBalancingPolicy::ChannelControlHelper* helper, const ChannelArgs& args) Y_NO_SANITIZE("undefined")
  32. : DualRefCounted<SubchannelListType>(tracer),
  33. policy_(policy),
  34. tracer_(tracer) {