aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@gcc.gnu.org>2013-09-01 15:27:14 +0000
committerJan Hubicka <hubicka@gcc.gnu.org>2013-09-01 15:27:14 +0000
commitca1eedf6742ef068e85e561e33b88275cc7d7a00 (patch)
treec12c50109305a325840c4eb0f6cd345943805198 /gcc
parentbbc9396b62a65e8ecc67bb2f8df870e2b5040ac7 (diff)
downloadgcc-ca1eedf6742ef068e85e561e33b88275cc7d7a00.zip
gcc-ca1eedf6742ef068e85e561e33b88275cc7d7a00.tar.gz
gcc-ca1eedf6742ef068e85e561e33b88275cc7d7a00.tar.bz2
Correct previous commit to the final version of patch.
From-SVN: r202146
Diffstat (limited to 'gcc')
-rw-r--r--gcc/common.opt8
-rw-r--r--gcc/ipa-devirt.c2
-rw-r--r--gcc/testsuite/g++.dg/ipa/devirt-11.C2
3 files changed, 6 insertions, 6 deletions
diff --git a/gcc/common.opt b/gcc/common.opt
index a18a42b..fae9763 100644
--- 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 cab583e..f9a5ae3 100644
--- 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 53f95bb..b888935 100644
--- 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
{