From: Marek Polacek <polacek@redhat.com>
Date: Fri, 7 Oct 2016 11:45:50 +0000 (+0000)
Subject: re PR c++/77803 (Bogus implicit-fallthrough warning)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d4bd46463c63cf0304a71563f1b68f271f3cb230;p=gcc.git

re PR c++/77803 (Bogus implicit-fallthrough warning)

	PR c++/77803
	* gimplify.c (last_stmt_in_scope): Add check for FALLTHROUGH ().

	* g++.dg/warn/Wimplicit-fallthrough-1.C: New test.

From-SVN: r240861
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 15315eb39eb..ece1252c5ca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/77803
+	* gimplify.c (last_stmt_in_scope): Add check for FALLTHROUGH ().
+
 2016-10-07  Richard Biener  <rguenther@suse.de>
 
 	* bitmap.h: Document constraints on bitmap modification while
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 66bb8be264b..a60d9471c68 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -1687,6 +1687,8 @@ last_stmt_in_scope (gimple *stmt)
 	stmt = gimple_seq_last_stmt (gimple_try_eval (try_stmt));
 	gimple *last_eval = last_stmt_in_scope (stmt);
 	if (gimple_stmt_may_fallthru (last_eval)
+	    && (last_eval == NULL
+		|| !gimple_call_internal_p (last_eval, IFN_FALLTHROUGH))
 	    && gimple_try_kind (try_stmt) == GIMPLE_TRY_FINALLY)
 	  {
 	    stmt = gimple_seq_last_stmt (gimple_try_cleanup (try_stmt));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5721cda85eb..49ad223b5f1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/77803
+	* g++.dg/warn/Wimplicit-fallthrough-1.C: New test.
+
 2016-10-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/77664
diff --git a/gcc/testsuite/g++.dg/warn/Wimplicit-fallthrough-1.C b/gcc/testsuite/g++.dg/warn/Wimplicit-fallthrough-1.C
new file mode 100644
index 00000000000..053ed6885c5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wimplicit-fallthrough-1.C
@@ -0,0 +1,33 @@
+// PR c++/77803
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wimplicit-fallthrough" }
+
+struct A {};
+int a;
+
+void
+fn1 ()
+{
+  switch (0) {
+  case 0:
+  {
+    A b;
+    [[fallthrough]];
+  }
+  default:
+    a = 0;
+  }
+}
+
+void
+fn2 ()
+{
+  switch (0) {
+  case 0:
+  {
+    A b; // { dg-warning "statement may fall through" }
+  }
+  default:
+    a = 0;
+  }
+}