From 606358faa6dbcebb271c1eb9b269a93374fba784 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 17 Oct 2019 00:19:13 +0200 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ecaf312639b..6c1e6b46377 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-10-16 Jakub Jelinek + + * 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 * class.c (build_clones): Break out of clone_function_decl. Just diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a9ff4275a67..5e510c91aa3 100644 --- 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) -- 2.30.2