[tor-commits] [tor/master] Try fixing Windows build to work with ALL_BUGS_ARE_FATAL

[teor at torproject.org]

commit 752122b2e9647b82fbb7f6eac120d57b913761f9
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Sat Mar 14 16:43:08 2020 +0200

    Try fixing Windows build to work with ALL_BUGS_ARE_FATAL
---
 src/feature/dircache/conscache.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/feature/dircache/conscache.c b/src/feature/dircache/conscache.c
index ceba410a5..d9aaccddc 100644
--- a/src/feature/dircache/conscache.c
+++ b/src/feature/dircache/conscache.c
@@ -132,6 +132,15 @@ consensus_cache_may_overallocate(consensus_cache_t *cache)
 #endif
 }
 
+// HACK: GCC on Appveyor hates that we may assert before returning. Work around
+// the error.
+#ifdef _WIN32
+#ifndef COCCI
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn"
+#endif
+#endif
+
 /**
  * Tell the sandbox (if any) configured by <b>cfg</b> to allow the
  * operations that <b>cache</b> will need.
@@ -156,6 +165,12 @@ consensus_cache_register_with_sandbox(consensus_cache_t *cache,
   return storage_dir_register_with_sandbox(cache->dir, cfg);
 }
 
+#ifdef _WIN32
+#ifndef COCCI
+#pragma GCC diagnostic pop
+#endif
+#endif
+
 /**
  * Helper: clear all entries from <b>cache</b> (but do not delete
  * any that aren't marked for removal