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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a72b4bcfef8d044e62bcd54dcb66cc446e667b52..943c8793bc29c3acb988ee50444e5e3d12e50ee3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,10 @@
-2017-12-13  Alexandre Oliva <aoliva@redhat.com>
+2017-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+       PR bootstrap/83396
+       * final.c (rest_of_handle_final): Call variable_tracking_main only
+       if !flag_var_tracking.
+
+2017-12-13  Alexandre Oliva  <aoliva@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>
 
        PR bootstrap/83396

diff --git a/gcc/final.c b/gcc/final.c
index 3bcb9c5a2dd628e518d1ee0699465a77a54ef9fa..d9f2f93b3e25478218b32f19cec794420066afca 100644 (file)
--- 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 4af0d0c4d69868e6f667425ca1d58a9f2257c9b8..43ef569fb1c12f270ed8acb8661b634f801099f3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,4 @@
-2017-12-13  Alexandre Oliva <aoliva@redhat.com>
+2017-12-13  Alexandre Oliva  <aoliva@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>
 
        PR bootstrap/83396