From ff72f3eeff2839b5727f562e6ad273a27a3a22d4 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Thu, 7 Feb 2019 14:57:58 -0800
Subject: [PATCH] Skip the test instead

---
 src/core/lib/surface/call.cc          | 6 +++---
 src/core/lib/transport/error_utils.cc | 8 ++++----
 test/core/util/ubsan_suppressions.txt | 1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index 3efe81f51eb..d53eb704420 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -1494,9 +1494,9 @@ static void free_no_op_completion(void* p, grpc_cq_completion* completion) {
   gpr_free(completion);
 }
 
-__attribute__((no_sanitize("enum"))) static grpc_call_error call_start_batch(
-    grpc_call* call, const grpc_op* ops, size_t nops, void* notify_tag,
-    int is_notify_tag_closure) {
+static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops,
+                                        size_t nops, void* notify_tag,
+                                        int is_notify_tag_closure) {
   GPR_TIMER_SCOPE("call_start_batch", 0);
 
   size_t i;
diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc
index 3294b2accdd..558f1d494cd 100644
--- a/src/core/lib/transport/error_utils.cc
+++ b/src/core/lib/transport/error_utils.cc
@@ -44,10 +44,10 @@ static grpc_error* recursively_find_error_with_field(grpc_error* error,
   return nullptr;
 }
 
-__attribute__((no_sanitize("enum"))) void grpc_error_get_status(
-    grpc_error* error, grpc_millis deadline, grpc_status_code* code,
-    grpc_slice* slice, grpc_http2_error_code* http_error,
-    const char** error_string) {
+void grpc_error_get_status(grpc_error* error, grpc_millis deadline,
+                           grpc_status_code* code, grpc_slice* slice,
+                           grpc_http2_error_code* http_error,
+                           const char** error_string) {
   // Start with the parent error and recurse through the tree of children
   // until we find the first one that has a status code.
   grpc_error* found_error =
diff --git a/test/core/util/ubsan_suppressions.txt b/test/core/util/ubsan_suppressions.txt
index 8e17d37ec7e..06533d9eb62 100644
--- a/test/core/util/ubsan_suppressions.txt
+++ b/test/core/util/ubsan_suppressions.txt
@@ -21,3 +21,4 @@ enum:grpc_op_string
 signed-integer-overflow:chrono
 enum:grpc_http2_error_to_grpc_status
 enum:grpc_chttp2_cancel_stream
+enum:api_fuzzer