commit 6d14242af687012f281ee825775332bba6635712
author Craig Tiller <ctiller@google.com> Fri Oct 06 13:56:35 2017 -0700
committer GitHub <noreply@github.com> Fri Oct 06 13:56:35 2017 -0700
tree 2c0711f3b962fcf844ace9a86360eeb61c2e7351
parent 3640b4084ac8485ef99ab3162cae7b8b079bbf6b
parent 56f8da0f9616ddea110a713a8daf2398493e7b8f

Merge pull request #12868 from ctiller/merge-fixup

Import fixes

src/core/lib/iomgr/block_annotate.h

diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h
index cbcb5d9..fcbfe9e 100644
--- a/src/core/lib/iomgr/block_annotate.h
+++ b/src/core/lib/iomgr/block_annotate.h
@@ -39,9 +39,14 @@
   do {                                        \
     gpr_thd_start_blocking_region();          \
   } while (0)
-#define GRPC_SCHEDULING_END_BLOCKING_REGION \
-  do {                                      \
-    gpr_thd_end_blocking_region();          \
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \
+  do {                                                  \
+    gpr_thd_end_blocking_region();                      \
+  } while (0)
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \
+  do {                                                        \
+    gpr_thd_end_blocking_region();                            \
+    grpc_exec_ctx_invalidate_now((ec));                       \
   } while (0)
 #else
 #define GRPC_SCHEDULING_START_BLOCKING_REGION \