decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup...

	* decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup,
	if cleanup is a nop, clear location of its operand too.

From-SVN: r277084

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ecaf312..6c1e6b4 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-16  Jakub Jelinek  <jakub@redhat.com>
+
+       * decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup,
+       if cleanup is a nop, clear location of its operand too.
+
 2019-10-15  Nathan Sidwell  <nathan@acm.org>
 
        * class.c (build_clones): Break out of clone_function_decl.  Just

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a9ff427..5e510c9 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -16864,6 +16864,8 @@ cxx_maybe_build_cleanup (tree decl, tsubst_flags_t complain)
      the end of the block.  So let's unset the location of the
      destructor call instead.  */
   protected_set_expr_location (cleanup, UNKNOWN_LOCATION);
+  if (cleanup && CONVERT_EXPR_P (cleanup))
+    protected_set_expr_location (TREE_OPERAND (cleanup, 0), UNKNOWN_LOCATION);
 
   if (cleanup
       && DECL_P (decl)