Correct previous commit to the final version of patch.

From-SVN: r202146

diff --git a/gcc/common.opt b/gcc/common.opt
index a18a42b410a13034275d6b4be974c1e8c84e41d3..fae976393d560d0137876e18d8c3f03878c56724 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1003,14 +1003,14 @@ fdelete-null-pointer-checks
 Common Report Var(flag_delete_null_pointer_checks) Init(1) Optimization
 Delete useless null pointer checks
 
-fdevirtualize
-Common Report Var(flag_devirtualize) Optimization
-Try to convert virtual calls to direct ones.
-
 fdevirtualize-speculatively
 Common Report Var(flag_devirtualize_speculatively) Optimization
 Perform speculative devirtualization
 
+fdevirtualize
+Common Report Var(flag_devirtualize) Optimization
+Try to convert virtual calls to direct ones.
+
 fdiagnostics-show-location=
 Common Joined RejectNegative Enum(diagnostic_prefixing_rule)
 -fdiagnostics-show-location=[once|every-line]  How often to emit source location at the beginning of line-wrapped diagnostics

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index cab583eb1917dac18339b1c0083a3e997ccda438..f9a5ae3f7a1c6b5f4db4d2efe228b5b06c1219ca 100644 (file)
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -944,7 +944,7 @@ gate_ipa_devirt (void)
 {
   /* FIXME: We should remove the optimize check after we ensure we never run
      IPA passes when not optimizing.  */
-  return (flag_devirtualize || flag_devirtualize_speculatively) && !in_lto_p;
+  return flag_devirtualize && !in_lto_p;
 }
 
 namespace {

diff --git a/gcc/testsuite/g++.dg/ipa/devirt-11.C b/gcc/testsuite/g++.dg/ipa/devirt-11.C
index 53f95bbcd3a05a10003d8f89398b757ddc58bab1..b888935ff307b410e2deb3b43d5f9c9c863a59bd 100644 (file)
--- a/gcc/testsuite/g++.dg/ipa/devirt-11.C
+++ b/gcc/testsuite/g++.dg/ipa/devirt-11.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-ipa-inline -fno-devirtualize-speuclatively" } */
+/* { dg-options "-O2 -fdump-ipa-inline -fno-devirtualize-speculatively" } */
 int baz ();
 struct A
 {