diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2015-12-03 05:13:33 +0100 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2015-12-03 04:13:33 +0000 |
| commit | 89bbe9ba36dfcf71ab9e5d85c447f3511e7f8d97 (patch) | |
| tree | 9674e64e768786b317980cd760a40e8197f495dc /gcc | |
| parent | eaa728e3a23192ecce0a3b9c731f47e778cd9592 (diff) | |
| download | gcc-89bbe9ba36dfcf71ab9e5d85c447f3511e7f8d97.zip gcc-89bbe9ba36dfcf71ab9e5d85c447f3511e7f8d97.tar.gz gcc-89bbe9ba36dfcf71ab9e5d85c447f3511e7f8d97.tar.bz2 | |
re PR c++/68184 (Exception from a virtual function does not get caught)
PR ipa/68184
* g++.dg/torture/pr68184.C: New testcase.
* cgraphunit.c (cgraph_node::analyze): Set can_throw_external.
From-SVN: r231217
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cgraphunit.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr68184.C | 31 |
4 files changed, 42 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f15b2d2..1d96d7b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-12-02 Jan Hubicka <hubicka@ucw.cz> + + PR ipa/68184 + * cgraphunit.c (cgraph_node::analyze): Set can_throw_external. + 2015-12-02 Aditya Kumar <aditya.k7@samsung.com> Sebastian Pop <s.pop@samsung.com> diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 4ce5f9b..4ab6414 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -575,6 +575,7 @@ cgraph_node::analyze (void) cgraph_node *t = cgraph_node::get (thunk.alias); create_edge (t, NULL, 0, CGRAPH_FREQ_BASE); + callees->can_throw_external = !TREE_NOTHROW (t->decl); /* Target code in expand_thunk may need the thunk's target to be analyzed, so recurse here. */ if (!t->analyzed) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7f39c2d..2e9f6b8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-12-02 Jan Hubicka <hubicka@ucw.cz> + + PR ipa/68184 + * g++.dg/torture/pr68184.C: New testcase. + 2015-12-03 Jakub Jelinek <jakub@redhat.com> PR preprocessor/57580 diff --git a/gcc/testsuite/g++.dg/torture/pr68184.C b/gcc/testsuite/g++.dg/torture/pr68184.C new file mode 100644 index 0000000..d0c7c84 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr68184.C @@ -0,0 +1,31 @@ +// { dg-do run } +namespace { +struct IFoo { virtual void foo() = 0; }; +struct IBar { virtual void bar() = 0; }; + +struct FooBar : private IBar, private IFoo +{ + void call_foo() + { + try + { + static_cast<IFoo*>(this)->foo(); + } + catch( ... ) {} + } + void foo() { throw 1; } + void bar() {} +}; + +void test() +{ + FooBar foobar; + foobar.call_foo(); +} +} +int main() +{ + test(); + return 0; +} + |