From 159efc46642755d385a8167dd2e84a0afffe6fe7 Mon Sep 17 00:00:00 2001 From: davidxl Date: Thu, 22 May 2014 18:18:48 +0000 Subject: [PATCH] Fix expected messages in test git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210820 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/g++.dg/ipa/devirt-15.C | 4 ++-- gcc/testsuite/g++.dg/ipa/devirt-16.C | 4 ++-- gcc/testsuite/g++.dg/ipa/devirt-17.C | 4 ++-- gcc/testsuite/g++.dg/ipa/devirt-26.C | 4 ++-- gcc/testsuite/g++.dg/ipa/imm-devirt-1.C | 2 +- gcc/testsuite/g++.dg/ipa/imm-devirt-2.C | 2 +- gcc/testsuite/g++.dg/tree-ssa/pr8781.C | 2 +- 8 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 84052373e91..4e86b8dd633 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2014-05-22 Xinliang David Li + + * g++.dg/ipa/devirt-15.C: Fix expected message. + * g++.dg/ipa/devirt-16.C: Ditto. + * g++.dg/ipa/devirt-17.C: Ditto. + * g++.dg/ipa/devirt-26.C: Ditto. + * g++.dg/ipa/imm-devirt-1.C: Ditto. + * g++.dg/ipa/imm-devirt-2.C: Ditto. + * g++.dg/tree-ssa/pr8781.C:Ditto. + 2014-05-22 Peter Bergner * gcc.target/powerpc/htm-ttest.c: New test. diff --git a/gcc/testsuite/g++.dg/ipa/devirt-15.C b/gcc/testsuite/g++.dg/ipa/devirt-15.C index 2ea85f487f4..924564661b8 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-15.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-15.C @@ -1,7 +1,7 @@ /* Check that we speculatively devirutalize call to FOO to B::foo becuase A is noreturn. */ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-ipa-devirt -fdump-tree-optimized" } */ +/* { dg-options "-O2 -fdump-ipa-devirt-details -fdump-tree-optimized" } */ class A { public: virtual int foo(void) @@ -33,7 +33,7 @@ main() m(); } -/* { dg-final { scan-ipa-dump "Speculatively devirtualizing call" "devirt"} } */ +/* { dg-final { scan-ipa-dump "speculatively devirtualizing call" "devirt"} } */ /* { dg-final { cleanup-ipa-dump "devirt" } } */ /* Match if (PROF_6 == foo) to verify that the speculation survived. */ /* { dg-final { scan-tree-dump "== foo" "optimized"} } */ diff --git a/gcc/testsuite/g++.dg/ipa/devirt-16.C b/gcc/testsuite/g++.dg/ipa/devirt-16.C index 85567867ff1..dd7696e6f55 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-16.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-16.C @@ -1,7 +1,7 @@ /* We shall devirtualize to unreachable. No anonymous type method should surivve reachability. */ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-ipa-whole-program" } */ +/* { dg-options "-O2 -fdump-ipa-whole-program-details" } */ namespace { class B { public: @@ -32,7 +32,7 @@ main() return b->foo(); } -/* { dg-final { scan-ipa-dump "Devirtualizing" "whole-program"} } */ +/* { dg-final { scan-ipa-dump "devirtualizing" "whole-program"} } */ /* { dg-final { scan-ipa-dump "builtin_unreachable" "whole-program"} } */ /* { dg-final { scan-ipa-dump-not "A::foo" "whole-program"} } */ /* { dg-final { scan-ipa-dump-not "A::foo" "whole-program"} } */ diff --git a/gcc/testsuite/g++.dg/ipa/devirt-17.C b/gcc/testsuite/g++.dg/ipa/devirt-17.C index 9edfd73af56..ce7943a8464 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-17.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-17.C @@ -1,7 +1,7 @@ /* We shall devirtualize to B::foo since it is the only live candidate of an anonymous type. */ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-ipa-whole-program" } */ +/* { dg-options "-O2 -fdump-ipa-whole-program-details" } */ namespace { class B { public: @@ -37,7 +37,7 @@ main() return b->foo(); } -/* { dg-final { scan-ipa-dump "Devirtualizing" "whole-program"} } */ +/* { dg-final { scan-ipa-dump "devirtualizing" "whole-program"} } */ /* { dg-final { scan-ipa-dump-not "builtin_unreachable" "whole-program"} } */ /* { dg-final { scan-ipa-dump "B::foo" "whole-program"} } */ /* { dg-final { scan-ipa-dump-not "A::foo" "whole-program"} } */ diff --git a/gcc/testsuite/g++.dg/ipa/devirt-26.C b/gcc/testsuite/g++.dg/ipa/devirt-26.C index 2df429c3457..469a1402d25 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-26.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-26.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O3 -fdump-ipa-devirt" } */ +/* { dg-options "-O3 -fdump-ipa-devirt-details" } */ struct A { int a; @@ -25,5 +25,5 @@ int test(void) /* The call to b->foo() is perfectly devirtualizable because C can not be in construction when &c was used, but we can not analyze that so far. Test that we at least speculate that type is in the construction. */ -/* { dg-final { scan-ipa-dump "Speculatively devirtualizing" "devirt" } } */ +/* { dg-final { scan-ipa-dump "speculatively devirtualizing" "devirt" } } */ /* { dg-final { cleanup-ipa-dump "devirt" } } */ diff --git a/gcc/testsuite/g++.dg/ipa/imm-devirt-1.C b/gcc/testsuite/g++.dg/ipa/imm-devirt-1.C index 32f7258a452..9307d96db09 100644 --- a/gcc/testsuite/g++.dg/ipa/imm-devirt-1.C +++ b/gcc/testsuite/g++.dg/ipa/imm-devirt-1.C @@ -58,5 +58,5 @@ int main (int argc, char *argv[]) return 0; } -/* { dg-final { scan-tree-dump "Replacing call target with foo" "fre1" } } */ +/* { dg-final { scan-tree-dump "converting indirect call to function virtual int B::foo" "fre1" } } */ /* { dg-final { cleanup-tree-dump "fre1" } } */ diff --git a/gcc/testsuite/g++.dg/ipa/imm-devirt-2.C b/gcc/testsuite/g++.dg/ipa/imm-devirt-2.C index 5bddc2fcb26..079aa4b6f15 100644 --- a/gcc/testsuite/g++.dg/ipa/imm-devirt-2.C +++ b/gcc/testsuite/g++.dg/ipa/imm-devirt-2.C @@ -91,5 +91,5 @@ int main (int argc, char *argv[]) return 0; } -/* { dg-final { scan-tree-dump "Replacing call target" "fre1" } } */ +/* { dg-final { scan-tree-dump "converting indirect call to function" "fre1" } } */ /* { dg-final { cleanup-tree-dump "fre1" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr8781.C b/gcc/testsuite/g++.dg/tree-ssa/pr8781.C index cc518a0d25a..bf754137232 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/pr8781.C +++ b/gcc/testsuite/g++.dg/tree-ssa/pr8781.C @@ -24,5 +24,5 @@ int x() /* We should optimize this to a direct call. */ -/* { dg-final { scan-tree-dump "Replacing call target with f" "fre1" } } */ +/* { dg-final { scan-tree-dump "converting indirect call to function int f()" "fre1" } } */ /* { dg-final { cleanup-tree-dump "fre1" } } */ -- 2.11.4.GIT