From 60012ddc08d9bbaa078c2ac830d594e3e6b4e2e0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 13 Dec 2017 19:47:45 +0100 Subject: [PATCH] re PR bootstrap/83396 (Bootstrap failures with Statement Frontiers) PR bootstrap/83396 * final.c (rest_of_handle_final): Call variable_tracking_main only if !flag_var_tracking. From-SVN: r255610 --- gcc/ChangeLog | 8 +++++++- gcc/final.c | 5 +++-- gcc/testsuite/ChangeLog | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a72b4bcfef8..943c8793bc2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,10 @@ -2017-12-13 Alexandre Oliva +2017-12-13 Jakub Jelinek + + PR bootstrap/83396 + * final.c (rest_of_handle_final): Call variable_tracking_main only + if !flag_var_tracking. + +2017-12-13 Alexandre Oliva Jakub Jelinek PR bootstrap/83396 diff --git a/gcc/final.c b/gcc/final.c index 3bcb9c5a2dd..d9f2f93b3e2 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -4541,8 +4541,9 @@ rest_of_handle_final (void) { const char *fnname = get_fnname_from_decl (current_function_decl); - /* Turn debug markers into notes. */ - if (!MAY_HAVE_DEBUG_BIND_INSNS && MAY_HAVE_DEBUG_MARKER_INSNS) + /* Turn debug markers into notes if the var-tracking pass has not + been invoked. */ + if (!flag_var_tracking && MAY_HAVE_DEBUG_MARKER_INSNS) variable_tracking_main (); assemble_start_function (current_function_decl, fnname); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4af0d0c4d69..43ef569fb1c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,4 @@ -2017-12-13 Alexandre Oliva +2017-12-13 Alexandre Oliva Jakub Jelinek PR bootstrap/83396 -- 2.30.2