diff options
| author | Richard Guenther <rguenther@suse.de> | 2010-02-15 11:27:54 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2010-02-15 11:27:54 +0000 |
| commit | 313333a6d4a764968406c2d7e59ff92f7676aa6f (patch) | |
| tree | 7538d2aea0cd90810a9163d516331efefa21ef01 /gcc | |
| parent | ff78880a17ca1412a232d5e8d3b41aa64d08a31f (diff) | |
| download | gcc-313333a6d4a764968406c2d7e59ff92f7676aa6f.zip gcc-313333a6d4a764968406c2d7e59ff92f7676aa6f.tar.gz gcc-313333a6d4a764968406c2d7e59ff92f7676aa6f.tar.bz2 | |
re PR tree-optimization/43068 (ICE: in estimate_operator_cost, at tree-inline.c:3141 with -freorder-blocks -ftracer)
2010-02-15 Richard Guenther <rguenther@suse.de>
PR middle-end/43068
* cgraphunit.c (thunk_adjust): Skip adjusting by fixed_offset
if that is zero.
* g++.dg/torture/pr43068.C: New testcase.
From-SVN: r156770
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cgraphunit.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr43068.C | 10 |
4 files changed, 25 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2196c90..b5148eb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-02-15 Richard Guenther <rguenther@suse.de> + + PR middle-end/43068 + * cgraphunit.c (thunk_adjust): Skip adjusting by fixed_offset + if that is zero. + 2010-02-15 Nick Clifton <nickc@redhat.com> * config/mn10300/mn10300.h (FUNCTION_ARG_REGNO_P): Revert previous diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 9cd5f16..ec7f9d8 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -1230,7 +1230,8 @@ thunk_adjust (gimple_stmt_iterator * bsi, gimple stmt; tree ret; - if (this_adjusting) + if (this_adjusting + && fixed_offset != 0) { stmt = gimple_build_assign (ptr, fold_build2_loc (input_location, @@ -1315,7 +1316,8 @@ thunk_adjust (gimple_stmt_iterator * bsi, offsettmp); } - if (!this_adjusting) + if (!this_adjusting + && fixed_offset != 0) /* Adjust the pointer by the constant. */ { tree ptrtmp; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4ad1e67..a06de9a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-02-15 Richard Guenther <rguenther@suse.de> + + PR middle-end/43068 + * g++.dg/torture/pr43068.C: New testcase. + 2010-02-14 Volker Reichelt <reichelt@gcc.gnu.org> PR c++/43024 diff --git a/gcc/testsuite/g++.dg/torture/pr43068.C b/gcc/testsuite/g++.dg/torture/pr43068.C new file mode 100644 index 0000000..524fd23 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr43068.C @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-freorder-blocks -ftracer} */ + +struct A { + virtual A *f(); +}; +struct B : virtual A { + virtual B *f(); +}; +B *B::f() { return 0; } |