[PATCH] Fix PR61998

Markus Trippelsdorf markus@trippelsdorf.de
Fri Sep 19 14:54:00 GMT 2014


This patch fixes ipa/61998, where simple testcases would crash when
using -Wsuggest-final-types, by bailing out early when odr_types_ptr is
NULL in ipa_devirt().

Approved by Honza on IRC.
Boostrapped and tested on x86_64-unknown-linux-gnu, applied.
    
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2200fcdc426..0dc7b3325922 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-19  Markus Trippelsdorf  <markus@trippelsdorf.de>
+
+	PR ipa/61998
+	* ipa-devirt.c (ipa_devirt): Bail out if odr_types_ptr is NULL.
+
 2014-09-19  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* doc/md.texi (Modifiers): Consistently use "read/write"
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 0a11eb72085f..61e87e80240c 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -3952,6 +3952,9 @@ ipa_devirt (void)
   int nmultiple = 0, noverwritable = 0, ndevirtualized = 0, nnotdefined = 0;
   int nwrong = 0, nok = 0, nexternal = 0, nartificial = 0;
 
+  if (!odr_types_ptr)
+    return 0;
+
   /* We can output -Wsuggest-final-methods and -Wsuggest-final-types warnings.
      This is implemented by setting up final_warning_records that are updated
      by get_polymorphic_call_targets.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b0f2bc80696e..747aad8b6a30 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-19  Markus Trippelsdorf  <markus@trippelsdorf.de>
+
+	PR ipa/61998
+	* g++.dg/warn/Wsuggest-final-2.C: New testcase.
+
 2014-09-19  Joost VandeVondele  <vondele@gcc.gnu.org>
 
 	PR fortran/63152
diff --git a/gcc/testsuite/g++.dg/warn/Wsuggest-final-2.C b/gcc/testsuite/g++.dg/warn/Wsuggest-final-2.C
new file mode 100644
index 000000000000..51e466d59404
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wsuggest-final-2.C
@@ -0,0 +1,4 @@
+// PR ipa/61998
+// { dg-do compile }
+// { dg-options "-O2 -Wsuggest-final-types" }
+int main () {}
-- 
Markus



More information about the Gcc-patches mailing list