From: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 5 Apr 2016 20:58:56 +0000 (+0000)
Subject: 	PR ipa/66223
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdf23925691af3f71a6e8f8a576e92a53d7ae484;p=thirdparty%2Fgcc.git

	PR ipa/66223
	* ipa-devirt.c (maybe_record_node): Fix comment; use
	SANITIZE_UNREACHABLE instead of SANITIZE_UNDEFINED.

	* g++.dg/ipa/devirt-51.C: Use -fsanitize=unreachable.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234762 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df63cc59b8d1..e9f5b1e89737 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-05  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/66223
+	* ipa-devirt.c (maybe_record_node): Fix comment; use
+	SANITIZE_UNREACHABLE instead of SANITIZE_UNDEFINED.
+
 2016-04-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/70542
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 22ece9f76afc..2cf018bdf39f 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -2438,9 +2438,9 @@ maybe_record_node (vec <cgraph_node *> &nodes,
     {
       gcc_assert (!target_node->global.inlined_to);
       gcc_assert (target_node->real_symbol_p ());
-      /* When sanitizing, do not asume that cxa_pure_virutal is not called
+      /* When sanitizing, do not assume that __cxa_pure_virtual is not called
 	 by valid program.  */
-      if (flag_sanitize & SANITIZE_UNDEFINED)
+      if (flag_sanitize & SANITIZE_UNREACHABLE)
 	;
       /* Only add pure virtual if it is the only possible target.  This way
 	 we will preserve the diagnostics about pure virtual called in many
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ab6935c72fb1..f121683b0850 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-05  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/66223
+	* g++.dg/ipa/devirt-51.C: Use -fsanitize=unreachable.
+
 2016-04-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/70542
diff --git a/gcc/testsuite/g++.dg/ipa/devirt-51.C b/gcc/testsuite/g++.dg/ipa/devirt-51.C
index fadf9e2e089f..236635af23ef 100644
--- a/gcc/testsuite/g++.dg/ipa/devirt-51.C
+++ b/gcc/testsuite/g++.dg/ipa/devirt-51.C
@@ -2,7 +2,7 @@
    variant.  Either keeping virtual call or optimizing to cxa_pure_virtual
    is fine.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fsanitize=undefined -fdump-tree-optimized"  } */
+/* { dg-options "-O2 -fsanitize=unreachable -fdump-tree-optimized"  } */
 namespace {
   struct B {
         B* self;