From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 20 Dec 2010 18:37:36 +0000 (+0000)
Subject: 	* dwarf_reader.cc (Sized_dwarf_line_info::read_lines): Only keep
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7500420b3e1046dac0d90eae795314ecf4a99429;p=binutils-gdb.git

	* dwarf_reader.cc (Sized_dwarf_line_info::read_lines): Only keep
	second of two consecutive entries with same offset.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 4fbd9f70e17..64958ab925e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-20  Ian Lance Taylor  <iant@google.com>
+
+	* dwarf_reader.cc (Sized_dwarf_line_info::read_lines): Only keep
+	second of two consecutive entries with same offset.
+
 2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* testsuite/Makefile.am (ifuncmain2static_LDADD)
diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc
index 7fbfdaedc18..8110f381435 100644
--- a/gold/dwarf_reader.cc
+++ b/gold/dwarf_reader.cc
@@ -493,7 +493,18 @@ Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr
               Offset_to_lineno_entry entry
                   = { lsm.address, this->current_header_index_,
                       lsm.file_num, lsm.line_num };
-              line_number_map_[lsm.shndx].push_back(entry);
+	      std::vector<Offset_to_lineno_entry>&
+		map(this->line_number_map_[lsm.shndx]);
+	      // If we see two consecutive entries with the same
+	      // offset and a real line number, then always use the
+	      // second one.
+	      if (!map.empty()
+		  && (map.back().offset == static_cast<off_t>(lsm.address))
+		  && lsm.line_num != -1
+		  && map.back().line_num != -1)
+		map.back() = entry;
+	      else
+		map.push_back(entry);
             }
           lineptr += oplength;
         }
diff --git a/gold/dwarf_reader.h b/gold/dwarf_reader.h
index c1978332ee8..8fe7898a55a 100644
--- a/gold/dwarf_reader.h
+++ b/gold/dwarf_reader.h
@@ -46,7 +46,10 @@ struct Offset_to_lineno_entry
   int header_num;  // which file-list to use (i.e. which .o file are we in)
   int file_num;    // a pointer into files_
   int line_num;    // the line number in the source file
-  // Offsets are unique within a section, so that's a sufficient sort key.
+
+  // When we add entries to the table, we always use the last entry
+  // with a given offset.  Given proper DWARF info, this should ensure
+  // that the offset is a sufficient sort key.
   bool operator<(const Offset_to_lineno_entry& that) const
   { return this->offset < that.offset; }
 };