diff options
| author | Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> | 2011-08-23 14:56:48 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-08-23 10:56:48 -0400 |
| commit | e70e0b60724694c40064580368e5b93aae951842 (patch) | |
| tree | 0e47c675ab7cee9f6ecfde53d2aa6253c1b0783d /gcc | |
| parent | d466b40756ea5ed503f7d5c43bddf9f5cf57b859 (diff) | |
| download | gcc-e70e0b60724694c40064580368e5b93aae951842.zip gcc-e70e0b60724694c40064580368e5b93aae951842.tar.gz gcc-e70e0b60724694c40064580368e5b93aae951842.tar.bz2 | |
re PR c++/50055 ([PATCH] Location information for the throw() specification in a function may be incorrect)
PR c++/50055
* except.c (begin_eh_spec_block): Build EH_SPEC block on the
same line as the function.
From-SVN: r177990
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/except.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gcov/gcov-7.C | 28 |
4 files changed, 43 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b9e83d4..5ebab87 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-08-23 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> + + PR c++/50055 + * except.c (begin_eh_spec_block): Build EH_SPEC block on the + same line as the function. + 2011-08-23 Jakub Jelinek <jakub@redhat.com> PR c++/46862 diff --git a/gcc/cp/except.c b/gcc/cp/except.c index 129d2f4..bfc520d 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -527,15 +527,17 @@ tree begin_eh_spec_block (void) { tree r; + location_t spec_location = DECL_SOURCE_LOCATION (current_function_decl); + /* A noexcept specification (or throw() with -fnothrow-opt) is a MUST_NOT_THROW_EXPR. */ if (TYPE_NOEXCEPT_P (TREE_TYPE (current_function_decl))) { - r = build_stmt (input_location, MUST_NOT_THROW_EXPR, NULL_TREE); + r = build_stmt (spec_location, MUST_NOT_THROW_EXPR, NULL_TREE); TREE_SIDE_EFFECTS (r) = 1; } else - r = build_stmt (input_location, EH_SPEC_BLOCK, NULL_TREE, NULL_TREE); + r = build_stmt (spec_location, EH_SPEC_BLOCK, NULL_TREE, NULL_TREE); add_stmt (r); TREE_OPERAND (r, 0) = push_stmt_list (); return r; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6d413f3..bac7961 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-08-23 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> + + PR c++/50055 + * g++.dg/gcov/gcov-7.C: New test. + 2011-08-23 Jakub Jelinek <jakub@redhat.com> PR c++/46862 diff --git a/gcc/testsuite/g++.dg/gcov/gcov-7.C b/gcc/testsuite/g++.dg/gcov/gcov-7.C new file mode 100644 index 0000000..db3e95a --- /dev/null +++ b/gcc/testsuite/g++.dg/gcov/gcov-7.C @@ -0,0 +1,28 @@ +/* Check that Exception handler specification is not + mapped to the curly braces below the function + declaration. */ + +/* { dg-options "-fprofile-arcs -ftest-coverage" } */ +/* { dg-do run { target native } } */ + +struct foo +{ + foo () throw (int) + { /* count (-) */ + throw (1); + } +}; + +int main () +{ + try + { + foo f; + } + catch ( ...) + { + return 0; + } +} + +/* { dg-final { run-gcov gcov-7.C } } */ |