From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 23 Nov 2016 19:51:27 +0000 (+0100)
Subject: re PR sanitizer/69278 (Confusion option handling for -sanitize-recovery=alll)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c944c6a2b209843fc94844838ed8223d669ab401;p=gcc.git

re PR sanitizer/69278 (Confusion option handling for -sanitize-recovery=alll)

	PR sanitizer/69278
	* opts.c (parse_sanitizer_options): For -fsanitize=undefined,
	restore enabling also SANITIZE_UNREACHABLE and SANITIZE_RETURN.

	* g++.dg/ubsan/return-7.C: New test.
	* c-c++-common/ubsan/unreachable-4.c: New test.

From-SVN: r242795
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c610804b3b8..276d8b8f57f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/69278
+	* opts.c (parse_sanitizer_options): For -fsanitize=undefined,
+	restore enabling also SANITIZE_UNREACHABLE and SANITIZE_RETURN.
+
 2016-11-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/69183
diff --git a/gcc/opts.c b/gcc/opts.c
index cb20154d194..c61c3677a66 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1558,7 +1558,8 @@ parse_sanitizer_options (const char *p, location_t loc, int scode,
 		/* Do not enable -fsanitize-recover=unreachable and
 		   -fsanitize-recover=return if -fsanitize-recover=undefined
 		   is selected.  */
-		if (sanitizer_opts[i].flag == SANITIZE_UNDEFINED)
+		if (code == OPT_fsanitize_recover_
+		    && sanitizer_opts[i].flag == SANITIZE_UNDEFINED)
 		  flags |= (SANITIZE_UNDEFINED
 			    & ~(SANITIZE_UNREACHABLE | SANITIZE_RETURN));
 		else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 317b4d101c9..b8cb594840a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2016-11-23  Jakub Jelinek  <jakub@redhat.com>
 
+	PR sanitizer/69278
+	* g++.dg/ubsan/return-7.C: New test.
+	* c-c++-common/ubsan/unreachable-4.c: New test.
+
 	PR tree-optimization/78482
 	* gcc.dg/torture/pr78482.c (c, d): Use signed char instead of char.
 	(bar): New function.
diff --git a/gcc/testsuite/c-c++-common/ubsan/unreachable-4.c b/gcc/testsuite/c-c++-common/ubsan/unreachable-4.c
new file mode 100644
index 00000000000..71b56e3f9cc
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/ubsan/unreachable-4.c
@@ -0,0 +1,10 @@
+/* { dg-do run } */
+/* { dg-options "-fsanitize=undefined" } */
+/* { dg-shouldfail "ubsan" } */
+
+int
+main (void)
+{
+  __builtin_unreachable ();
+}
+ /* { dg-output "execution reached a __builtin_unreachable\\(\\) call" } */
diff --git a/gcc/testsuite/g++.dg/ubsan/return-7.C b/gcc/testsuite/g++.dg/ubsan/return-7.C
new file mode 100644
index 00000000000..316cb4bc516
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ubsan/return-7.C
@@ -0,0 +1,27 @@
+// { dg-do run }
+// { dg-options "-fsanitize=undefined" }
+// { dg-shouldfail "ubsan" }
+
+struct S { S (); ~S (); };
+
+S::S () {}
+S::~S () {}
+
+int
+foo (int x)
+{
+  S a;
+  {
+    S b;
+    if (x)
+      return 1;
+  }
+}
+
+int
+main ()
+{
+  foo (0);
+}
+
+// { dg-output "execution reached the end of a value-returning function without returning a value" }