diff options
| author | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
| commit | f1c18afafc2b321465ae6b07ede127095942d7dc (patch) | |
| tree | 812093eebfa8510367718c12c02f7da03c0e73bf /gcc-4.9/gcc/testsuite/g++.dg | |
| parent | 38a8aecfb882072900434499696b5c32a2274515 (diff) | |
| download | toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.gz toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.bz2 toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.zip | |
[gcc-4.9] Merge svn r213650 from google/gcc-4_9 branch
Merge svn r213650 from google/gcc-4_9 branch. Tested with
arm,x86,mips,arm64,x86_64,mips64 build in liunux/windows.
Change-Id: I0c07f67d516074172aa393003eee664d01f2e0f2
Diffstat (limited to 'gcc-4.9/gcc/testsuite/g++.dg')
4 files changed, 10 insertions, 4 deletions
diff --git a/gcc-4.9/gcc/testsuite/g++.dg/compat/struct-layout-1.exp b/gcc-4.9/gcc/testsuite/g++.dg/compat/struct-layout-1.exp index 13211c2fa..4c7d4c43f 100644 --- a/gcc-4.9/gcc/testsuite/g++.dg/compat/struct-layout-1.exp +++ b/gcc-4.9/gcc/testsuite/g++.dg/compat/struct-layout-1.exp @@ -89,6 +89,9 @@ proc compat-use-tst-compiler { } { # This must be done after the compat-use-*-compiler definitions. load_lib compat.exp +# Provide the g++-dg-prune routine (gcc-dp.exp is loaded by compat.exp) +load_lib g++-dg.exp + g++_init # Save variables for the C++ compiler under test, which each test will diff --git a/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-1.C b/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-1.C index a0fbb5f42..69bd6a61d 100644 --- a/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-1.C +++ b/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-1.C @@ -27,5 +27,6 @@ void *test (MMixin & anExample) int main () { CExample c; - return (test (c) != &c); + test (c); + return 0; } diff --git a/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-2.C b/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-2.C index 1011bd1ef..dd925d25c 100644 --- a/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-2.C +++ b/gcc-4.9/gcc/testsuite/g++.dg/ipa/pr61160-2.C @@ -39,5 +39,6 @@ void *test (MMixin & anExample) int main () { CExample c; - return (test (c) != &c); + test (c); + return 0; } diff --git a/gcc-4.9/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C b/gcc-4.9/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C index 91f43ae8c..68fc48c2c 100644 --- a/gcc-4.9/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C +++ b/gcc-4.9/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C @@ -1,7 +1,8 @@ +// { dg-message "note: file" "" } // PR tree-optimization/39557 // invalid post-dom info leads to infinite loop // { dg-do run } -// { dg-options "-Wall -fno-exceptions -O2 -fprofile-use -fopt-info -fno-rtti" } +// { dg-options "-Wall -fno-exceptions -O2 -fprofile-use -fno-rtti -fno-diagnostics-show-caret" } struct C { @@ -49,4 +50,4 @@ main () { E e; e.bar (); -} // { dg-message "note: file" "" } +} |