Merge pull request #4302 from nicolasnoble/unreachable-gcov
Removing code coverage for unreachable code.
diff --git a/Makefile b/Makefile
index 00fa921..d7a3a3c 100644
--- a/Makefile
+++ b/Makefile
@@ -189,9 +189,9 @@
CXX_gcov = g++
LD_gcov = gcc
LDXX_gcov = g++
-CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage
+CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage -Wno-return-type
LDFLAGS_gcov = -fprofile-arcs -ftest-coverage -rdynamic
-DEFINES_gcov = _DEBUG DEBUG
+DEFINES_gcov = _DEBUG DEBUG GPR_GCOV
# General settings.
diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h
index 63e692c..557410b 100644
--- a/include/grpc/support/port_platform.h
+++ b/include/grpc/support/port_platform.h
@@ -183,7 +183,7 @@
#endif
#define GPR_MSG_IOVLEN_TYPE int
#if TARGET_OS_IPHONE
-#define GPR_FORBID_UNREACHABLE_CODE
+#define GPR_FORBID_UNREACHABLE_CODE 1
#define GPR_PLATFORM_STRING "ios"
#define GPR_CPU_IPHONE 1
#define GPR_PTHREAD_TLS 1
@@ -252,6 +252,11 @@
#define GPR_PLATFORM_STRING "unknown"
#endif
+#ifdef GPR_GCOV
+#undef GPR_FORBID_UNREACHABLE_CODE
+#define GPR_FORBID_UNREACHABLE_CODE 1
+#endif
+
/* For a common case, assume that the platform has a C99-like stdint.h */
#include <stdint.h>
@@ -337,7 +342,7 @@
#endif
#endif
-#ifdef GPR_FORBID_UNREACHABLE_CODE
+#if GPR_FORBID_UNREACHABLE_CODE
#define GPR_UNREACHABLE_CODE(STATEMENT)
#else
#define GPR_UNREACHABLE_CODE(STATEMENT) \
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 20d14c7..c1e472c 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -205,9 +205,9 @@
CXX_gcov = g++
LD_gcov = gcc
LDXX_gcov = g++
- CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage
+ CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage -Wno-return-type
LDFLAGS_gcov = -fprofile-arcs -ftest-coverage -rdynamic
- DEFINES_gcov = _DEBUG DEBUG
+ DEFINES_gcov = _DEBUG DEBUG GPR_GCOV
# General settings.