From: Cary Coutant <ccoutant@google.com>
Date: Mon, 23 Aug 2010 20:28:24 +0000 (+0000)
Subject: 	* archive.cc (Lib_group::add_symbols): Lock object before deleting its
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9919d93bc70b0ed9bb5991bcf46e4c3ffaa0a3ce;p=binutils-gdb.git

	* archive.cc (Lib_group::add_symbols): Lock object before deleting its
	symbols data.
	(Lib_group::include_member): Unlock object after deleting its
	symbols data.
	* testsuite/start_lib_test_3.c: Remove all global symbols to trigger
	the bug fixed here.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index beea4a3c907..e2792b2dac2 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-23  Cary Coutant  <ccoutant@google.com>
+
+	* archive.cc (Lib_group::add_symbols): Lock object before deleting its
+	symbols data.
+	(Lib_group::include_member): Unlock object after deleting its
+	symbols data.
+	* testsuite/start_lib_test_3.c: Remove all global symbols to trigger
+	the bug fixed here.
+
 2010-08-19  Neil Vachharajani  <nvachhar@google.com>
 	    Cary Coutant  <ccoutant@google.com>
 
diff --git a/gold/archive.cc b/gold/archive.cc
index 68a674ddfe8..dade0430de2 100644
--- a/gold/archive.cc
+++ b/gold/archive.cc
@@ -1057,7 +1057,14 @@ Lib_group::add_symbols(Symbol_table* symtab, Layout* layout,
           else
             {
               if (member.sd_ != NULL)
-                delete member.sd_;
+		{
+		  // The file must be locked in order to destroy the views
+		  // associated with it.
+		  gold_assert(obj != NULL);
+		  obj->lock(this->task_);
+		  delete member.sd_;
+		  obj->unlock(this->task_);
+		}
             }
 
 	  this->members_[i] = this->members_.back();
@@ -1096,10 +1103,10 @@ Lib_group::include_member(Symbol_table* symtab, Layout* layout,
 	layout->incremental_inputs()->report_object(obj, NULL);
       obj->layout(symtab, layout, sd);
       obj->add_symbols(symtab, sd, layout);
-      // Unlock the file for the next task.
-      obj->unlock(this->task_);
     }
   delete sd;
+  // Unlock the file for the next task.
+  obj->unlock(this->task_);
 }
 
 // Print statistical information to stderr.  This is used for --stats.
diff --git a/gold/testsuite/start_lib_test_3.c b/gold/testsuite/start_lib_test_3.c
index 555eea12bf2..86444e00995 100644
--- a/gold/testsuite/start_lib_test_3.c
+++ b/gold/testsuite/start_lib_test_3.c
@@ -22,9 +22,4 @@
 
    This is a test of the --start-lib and --end-lib options.  */
 
-extern void t3 (void);
-
-void
-t3 (void)
-{
-}
+static char t3[] = "t3";