From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 1 Dec 2017 08:11:56 +0000 (+0100)
Subject: re PR sanitizer/81275 (-fsanitize=thread produce incorrect -Wreturn-type warning)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9ede7b1bf0f85e3c14e09891ce0720c636ab8ffc;p=gcc.git

re PR sanitizer/81275 (-fsanitize=thread produce incorrect -Wreturn-type warning)

	PR sanitizer/81275
	* tree-cfg.c (group_case_labels_stmt): Don't optimize away
	C++ FE implicitly added __builtin_unreachable () until -Wreturn-type
	is diagnosed.

	* c-c++-common/tsan/pr81275.c: Remove dg-skip-if.

From-SVN: r255296
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e77936e2f70..5ab9f6fab5f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2017-12-01  Jakub Jelinek  <jakub@redhat.com>
 
+	PR sanitizer/81275
+	* tree-cfg.c (group_case_labels_stmt): Don't optimize away
+	C++ FE implicitly added __builtin_unreachable () until -Wreturn-type
+	is diagnosed.
+
 	PR sanitizer/83219
 	* tree-cfg.c: Include asan.h.
 	(gimple_seq_unreachable_p): Return false for -fsanitize=unreachable.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f2a2f7e9e5f..e41a29ddb8f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/81275
+	* c-c++-common/tsan/pr81275.c: Remove dg-skip-if.
+
 2017-12-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/83224
diff --git a/gcc/testsuite/c-c++-common/tsan/pr81275.c b/gcc/testsuite/c-c++-common/tsan/pr81275.c
index 14158506406..024b0c72f2c 100644
--- a/gcc/testsuite/c-c++-common/tsan/pr81275.c
+++ b/gcc/testsuite/c-c++-common/tsan/pr81275.c
@@ -1,7 +1,6 @@
 /* PR sanitizer/81275 */
 /* { dg-do compile } */
 /* { dg-options "-Wreturn-type -fsanitize=thread" } */
-/* { dg-skip-if "" { c++ } { "*" } { "-O0" } } */
 
 int
 f1 (int a, int b)
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 92f3201f4a4..4fb4a834b20 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1750,7 +1750,14 @@ group_case_labels_stmt (gswitch *stmt)
 
       /* Discard cases that have an unreachable destination block.  */
       if (EDGE_COUNT (base_bb->succs) == 0
-	  && gimple_seq_unreachable_p (bb_seq (base_bb)))
+	  && gimple_seq_unreachable_p (bb_seq (base_bb))
+	  /* Don't optimize this if __builtin_unreachable () is the
+	     implicitly added one by the C++ FE too early, before
+	     -Wreturn-type can be diagnosed.  We'll optimize it later
+	     during switchconv pass or any other cfg cleanup.  */
+	  && (gimple_in_ssa_p (cfun)
+	      || (LOCATION_LOCUS (gimple_location (last_stmt (base_bb)))
+		  != BUILTINS_LOCATION)))
 	{
 	  edge base_edge = find_edge (gimple_bb (stmt), base_bb);
 	  if (base_edge != NULL)