From a992a6d1f48622bb8cd39c04f06f41eba9c984c6 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Thu, 28 Jun 2012 07:39:51 +0000
Subject: [PATCH] re PR rtl-optimization/53706 (Bootstrap failure due to
 "Invalid write of size 8 at 0xBDC35E: variable_htab_free
 (var-tracking.c:1418))

PR debug/53706
PR debug/47624
* var-tracking.c (vt_emit_notes): Release loc_exp_dep_pool...
(vt_finalize): ... here instead, if needed.

From-SVN: r189037
---
 gcc/ChangeLog      | 9 +++++++++
 gcc/var-tracking.c | 9 ++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b5a0f317d2f..dd228e8cf73d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-28  Alexandre Oliva  <aoliva@redhat.com>,
+            Uros Bizjak  <ubizjak@gmail.com>,
+            Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/53706
+	PR debug/47624
+	* var-tracking.c (vt_emit_notes): Release loc_exp_dep_pool...
+	(vt_finalize): ... here instead, if needed.
+
 2012-06-28  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR debug/53740
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index be638d7ca25c..66ce35a00954 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -9260,11 +9260,7 @@ vt_emit_notes (void)
   dataflow_set_destroy (&cur);
 
   if (MAY_HAVE_DEBUG_INSNS)
-    {
-      free_alloc_pool (loc_exp_dep_pool);
-      loc_exp_dep_pool = NULL;
-      htab_delete (dropped_values);
-    }
+    htab_delete (dropped_values);
 
   emit_notes = false;
 }
@@ -9974,6 +9970,9 @@ vt_finalize (void)
 
   if (MAY_HAVE_DEBUG_INSNS)
     {
+      if (loc_exp_dep_pool)
+	free_alloc_pool (loc_exp_dep_pool);
+      loc_exp_dep_pool = NULL;
       free_alloc_pool (valvar_pool);
       VEC_free (rtx, heap, preserved_values);
       cselib_finish ();