[gcc/devel/omp/gcc-9] backport: re PR tree-optimization/85887 (Missing DW_TAG_lexical_block PC range)

[Tobias Burnus]

https://gcc.gnu.org/g:6bf274fc77bec150a300b7a439b3a90a4507b502

commit 6bf274fc77bec150a300b7a439b3a90a4507b502
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Fri Nov 8 19:53:46 2019 +0100

    backport: re PR tree-optimization/85887 (Missing DW_TAG_lexical_block PC range)
    
    	Backported from mainline
    	2019-10-22  Jakub Jelinek  <jakub@redhat.com>
    
    	PR tree-optimization/85887
    	* decl.c (expand_static_init): Drop ECF_LEAF from __cxa_guard_acquire
    	and __cxa_guard_release.
    
    From-SVN: r277982

Diff:
---
 gcc/cp/ChangeLog | 6 ++++++
 gcc/cp/decl.c    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b8a9441..6d54b57 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,12 @@
 2019-11-08  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2019-10-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/85887
+	* decl.c (expand_static_init): Drop ECF_LEAF from __cxa_guard_acquire
+	and __cxa_guard_release.
+
 	2019-10-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/92015
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 9769c1c..4878e81 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8422,14 +8422,14 @@ expand_static_init (tree decl, tree init)
 	      (acquire_name, build_function_type_list (integer_type_node,
 						       TREE_TYPE (guard_addr),
 						       NULL_TREE),
-	       NULL_TREE, ECF_NOTHROW | ECF_LEAF);
+	       NULL_TREE, ECF_NOTHROW);
 	  if (!release_fn || !abort_fn)
 	    vfntype = build_function_type_list (void_type_node,
 						TREE_TYPE (guard_addr),
 						NULL_TREE);
 	  if (!release_fn)
 	    release_fn = push_library_fn (release_name, vfntype, NULL_TREE,
-					   ECF_NOTHROW | ECF_LEAF);
+					  ECF_NOTHROW);
 	  if (!abort_fn)
 	    abort_fn = push_library_fn (abort_name, vfntype, NULL_TREE,
 					ECF_NOTHROW | ECF_LEAF);