diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-11-21 11:59:27 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-11-21 11:59:27 +0100 |
| commit | 01a0fba62602d008fe838aafa0ee5b1b35369e06 (patch) | |
| tree | 753363427bb25a48beabf8bf11526e1020f99d4e /gcc | |
| parent | 141793d5e91cac12a59ed3a4a8d432824ea753ee (diff) | |
| download | gcc-01a0fba62602d008fe838aafa0ee5b1b35369e06.zip gcc-01a0fba62602d008fe838aafa0ee5b1b35369e06.tar.gz gcc-01a0fba62602d008fe838aafa0ee5b1b35369e06.tar.bz2 | |
re PR tree-optimization/91355 (optimized code does not call destructor while unwinding after exception)
PR tree-optimization/91355
* tree-ssa-sink.c (select_best_block): Use >= rather than >
for early_bb scaled count with best_bb count comparison.
* g++.dg/torture/pr91355.C: New test.
From-SVN: r278548
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr91355.C | 28 | ||||
| -rw-r--r-- | gcc/tree-ssa-sink.c | 2 |
4 files changed, 38 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e705e4a..82cecf3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2019-11-21 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/91355 + * tree-ssa-sink.c (select_best_block): Use >= rather than > + for early_bb scaled count with best_bb count comparison. + * ipa-fnsummary.h (enum ipa_hints_vals): Fix comment typo, preffer -> prefer. * ipa-inline.c (edge_badness): Likewise. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5b0217c..7ff0ce7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-11-21 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/91355 + * g++.dg/torture/pr91355.C: New test. + 2019-11-21 Iain Sandoe <iain@sandoe.co.uk> * gcc.dg/gnu2x-attrs-1.c: Expect an error for the alias case diff --git a/gcc/testsuite/g++.dg/torture/pr91355.C b/gcc/testsuite/g++.dg/torture/pr91355.C new file mode 100644 index 0000000..7a385dc --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr91355.C @@ -0,0 +1,28 @@ +// PR tree-optimization/91355 +// { dg-do run } +// { dg-options "-std=c++14" } + +unsigned int d = 0; + +struct S { + S () { d++; } + S (const S &) { d++; } + ~S () { d--; } +}; + +void +foo (int i) throw (int) // { dg-warning "dynamic exception specifications are deprecated" } +{ + if (i == 0) + throw 3; + S d; + throw 3; +} + +int +main () +{ + try { foo (1); } catch (...) {} + if (d) + __builtin_abort (); +} diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c index eebff65..dbf1529 100644 --- a/gcc/tree-ssa-sink.c +++ b/gcc/tree-ssa-sink.c @@ -228,7 +228,7 @@ select_best_block (basic_block early_bb, /* If result of comparsion is unknown, prefer EARLY_BB. Thus use !(...>=..) rather than (...<...) */ && !(best_bb->count.apply_scale (100, 1) - > (early_bb->count.apply_scale (threshold, 1)))) + >= early_bb->count.apply_scale (threshold, 1))) return best_bb; /* No better block found, so return EARLY_BB, which happens to be the |