PR debug/49951 - jumpy stepping at end of scope in C++

gcc/cp/

	PR debug/49951
	* decl.c (cxx_maybe_build_cleanup): Don't set location of the call
	to the destructor.

gcc/testsuite/

	PR debug/49951
	* g++.dg/gcov/gcov-2.C: Adjust.

From-SVN: r182807

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 24d2b924a93eb13338e6599d6be88e899b6bd89b..9bb0366255213213b01be74041aefb40374b9b7e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-20  Dodji Seketeli  <dodji@redhat.com>
+
+       PR debug/49951
+       * decl.c (cxx_maybe_build_cleanup): Don't set location of the call
+       to the destructor.
+
 2011-12-16  Jason Merrill  <jason@redhat.com>
 
        PR c++/51416

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index fdf3ca155ed462f5bb58dedf6edd0f87b35b10b8..a2e52613fce95988527e6852af1e778914923f23 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -13363,8 +13363,17 @@ cxx_maybe_build_cleanup (tree decl)
        cleanup = call;
     }
 
+  /* build_delete sets the location of the destructor call to the
+     current location, even though the destructor is going to be
+     called later, at the end of the current scope.  This can lead to
+     a "jumpy" behaviour for users of debuggers when they step around
+     the end of the block.  So let's unset the location of the
+     destructor call instead.  */
+  if (cleanup != NULL && EXPR_P (cleanup))
+    SET_EXPR_LOCATION (cleanup, UNKNOWN_LOCATION);
   return cleanup;
 }
+
 \f
 /* When a stmt has been parsed, this function is called.  */
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2ce065e8003f75a595f815de43541be606c27ccb..d2b3eb91a557f310189f3bd83450ebd2a2de5220 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-20  Dodji Seketeli  <dodji@redhat.com>
+
+       PR debug/49951
+       * g++.dg/gcov/gcov-2.C: Adjust.
+
 2012-01-01  Thomas König  <tkoenig@gcc.gnu.org>
 
        Backport from trunk

diff --git a/gcc/testsuite/g++.dg/gcov/gcov-2.C b/gcc/testsuite/g++.dg/gcov/gcov-2.C
index 6d002f5d2cd01d7818d14c45ae7092924d2fa8d8..66d8af39bce402032b6e5d60929e5980d34a272e 100644 (file)
--- a/gcc/testsuite/g++.dg/gcov/gcov-2.C
+++ b/gcc/testsuite/g++.dg/gcov/gcov-2.C
@@ -20,7 +20,7 @@ private:
 
 void foo()
 {
-  C c;                                 /* count(2) */
+  C c;                                 /* count(1) */
   c.seti (1);                          /* count(1) */
 }