Comments

1 files changed, 12 insertions, 6 deletions

diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc
index 651488d0f1..fa5628dbcf 100644
--- a/src/core/lib/iomgr/polling_entity.cc
+++ b/src/core/lib/iomgr/polling_entity.cc
@@ -61,9 +61,12 @@ bool grpc_polling_entity_is_empty(const grpc_polling_entity* pollent) {
 void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent,
                                             grpc_pollset_set* pss_dst) {
   if (pollent->tag == GRPC_POLLS_POLLSET) {
-    if (pollent->pollent.pollset != nullptr) {
-      grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset);
-    }
+#ifdef GRPC_CFSTREAM
+    GPR_ASSERT(pollent->pollent.pollset == nullptr);
+#else
+    GPR_ASSERT(pollent->pollent.pollset != nullptr);
+    grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset);
+#endif
   } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) {
     GPR_ASSERT(pollent->pollent.pollset_set != nullptr);
     grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set);
@@ -76,9 +79,12 @@ void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent,
 void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent,
                                               grpc_pollset_set* pss_dst) {
   if (pollent->tag == GRPC_POLLS_POLLSET) {
-    if (pollent->pollent.pollset != nullptr) {
-      grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset);
-    }
+#ifdef GRPC_CFSTREAM
+    GPR_ASSERT(pollent->pollent.pollset == nullptr);
+#else
+    GPR_ASSERT(pollent->pollent.pollset != nullptr);
+    grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset);
+#endif
   } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) {
     GPR_ASSERT(pollent->pollent.pollset_set != nullptr);
     grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set);