2007-08-16 Seongbae Park <seongbae.park@gmail.com>
* tree-eh.c (lower_try_finally_onedest): Reset the locus
of GOTO that's relocated to a different block.
gcc/testsuite/ChangeLog:
2007-08-16 Seongbae Park <seongbae.park@gmail.com>
* g++.dg/gcov/gcov-4.C: New test.
* lib/gcov.exp (verify-lines): Add support for
checking no-coverage lines.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127562
138bc75d-0d04-0410-961f-
82ee72b054a4
+2007-08-16 Seongbae Park <seongbae.park@gmail.com>
+
+ * tree-eh.c (lower_try_finally_onedest): Reset the locus
+ of GOTO that's relocated to a different block.
+
2007-08-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* c-common.c (const_strip_array_types): New.
+2007-08-16 Seongbae Park <seongbae.park@gmail.com>
+
+ * g++.dg/gcov/gcov-4.C: New test.
+ * lib/gcov.exp (verify-lines): Add support for
+ checking no-coverage lines.
+
2007-08-16 Victor Kaplansky <victork@il.ibm.com>
* gcc.dg/vect/vect-vfa-01.c: New.
--- /dev/null
+/* Check that execution counts and branch probabilities for various C
+ constructs are reported correctly by gcov. */
+
+#include <stdio.h>
+
+/* { dg-options "-fprofile-arcs -ftest-coverage -fno-exceptions" } */
+/* { dg-do run { target native } } */
+
+class foo {
+public:
+ foo() { printf("foo()\n"); };
+ ~foo() { printf("~foo()\n"); };
+ void method(void) { printf("method()\n"); };
+};
+
+int func(int i, int j) __attribute__((noinline));
+
+int func(int i, int j){
+ if (j) {
+ printf("unreachable\n");
+ return 3;
+ }
+
+ foo f;
+
+ if (i == 1) {
+ f.method();
+ f.method();
+ } else {
+ f.method();
+ printf("unreachable\n");
+ return 2; /* count(#####) */
+ }
+ f.method();
+ return 0;
+}
+
+int main() {
+ return func(1, 0);
+}
+/* { dg-final { run-gcov gcov-4.C } } */
set failed 0
set fd [open $file r]
while { [gets $fd line] >= 0 } {
- if [regexp "^ *(\[^:]*): *(\[0-9\]+):.*count\\((\[0-9\]+)\\)" \
+ # We want to match both "-" and "#####" as count as well as numbers,
+ # since we want to detect lines that shouldn't be marked as covered.
+ if [regexp "^ *(\[^:]*): *(\[0-9\\-#]+):.*count\\((\[0-9\\-#]+)\\)" \
"$line" all is n shouldbe] {
if { $is == "" } {
fail "$n:no data available for this line"
}
}
+ /* Reset the locus of the goto since we're moving
+ goto to a different block which might be on a different line. */
+ SET_EXPR_LOCUS (tf->goto_queue[0].cont_stmt, NULL);
append_to_statement_list (tf->goto_queue[0].cont_stmt, tf->top_p);
maybe_record_in_goto_queue (state, tf->goto_queue[0].cont_stmt);
}