Remove dead code.

Patch by Rafael Espindola <rafael.espindola@gmail.com>

Review URL: http://breakpad.appspot.com/502003/


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1091 4c0a9323-5329-0410-9bdc-e9ce6186880e

8 files changed, 42 insertions, 107 deletions

diff --git a/src/common/dwarf/dwarf2diehandler.cc b/src/common/dwarf/dwarf2diehandler.cc
index c741d69f..20c15fa9 100644
--- a/src/common/dwarf/dwarf2diehandler.cc
+++ b/src/common/dwarf/dwarf2diehandler.cc
@@ -57,8 +57,7 @@ bool DIEDispatcher::StartCompilationUnit(uint64 offset, uint8 address_size,
                                              dwarf_version);
 }
 
-bool DIEDispatcher::StartDIE(uint64 offset, enum DwarfTag tag,
-                             const AttributeList& attrs) {
+bool DIEDispatcher::StartDIE(uint64 offset, enum DwarfTag tag) {
   // The stack entry for the parent of this DIE, if there is one.
   HandlerStack *parent = die_handlers_.empty() ? NULL : &die_handlers_.top();
 
@@ -82,7 +81,7 @@ bool DIEDispatcher::StartDIE(uint64 offset, enum DwarfTag tag,
   if (parent) {
     if (parent->handler_)
       // Ask the parent to find a handler.
-      handler = parent->handler_->FindChildHandler(offset, tag, attrs);
+      handler = parent->handler_->FindChildHandler(offset, tag);
     else
       // No parent handler means we're not interested in any of our
       // children.
@@ -92,7 +91,7 @@ bool DIEDispatcher::StartDIE(uint64 offset, enum DwarfTag tag,
     // decides whether to visit it, but the root DIE has no parent
     // handler, so we have a special method on the root DIE handler
     // itself to decide.
-    if (root_handler_->StartRootDIE(offset, tag, attrs))
+    if (root_handler_->StartRootDIE(offset, tag))
       handler = root_handler_;
     else
       handler = NULL;
diff --git a/src/common/dwarf/dwarf2diehandler.h b/src/common/dwarf/dwarf2diehandler.h
index 12b8d3a3..81f40f07 100644
--- a/src/common/dwarf/dwarf2diehandler.h
+++ b/src/common/dwarf/dwarf2diehandler.h
@@ -239,12 +239,10 @@ class DIEHandler {
   // that child DIE (and all its descendants).
   //
   // OFFSET is the offset of the child; TAG indicates what kind of DIE
-  // it is; and ATTRS is the list of attributes the DIE will have, and
-  // their forms (their values are not provided).
+  // it is.
   //
   // The default definition skips all children.
-  virtual DIEHandler *FindChildHandler(uint64 offset, enum DwarfTag tag,
-                                       const AttributeList &attrs) {
+  virtual DIEHandler *FindChildHandler(uint64 offset, enum DwarfTag tag) {
     return NULL;
   }
 
@@ -280,8 +278,7 @@ class RootDIEHandler: public DIEHandler {
   // unit.
   //
   // The default definition elects to visit the root DIE.
-  virtual bool StartRootDIE(uint64 offset, enum DwarfTag tag,
-                            const AttributeList& attrs) { return true; }
+  virtual bool StartRootDIE(uint64 offset, enum DwarfTag tag) { return true; }
 };
 
 class DIEDispatcher: public Dwarf2Handler {
@@ -296,8 +293,7 @@ class DIEDispatcher: public Dwarf2Handler {
   bool StartCompilationUnit(uint64 offset, uint8 address_size,
                             uint8 offset_size, uint64 cu_length,
                             uint8 dwarf_version);
-  bool StartDIE(uint64 offset, enum DwarfTag tag,
-                const AttributeList &attrs);
+  bool StartDIE(uint64 offset, enum DwarfTag tag);
   void ProcessAttributeUnsigned(uint64 offset,
                                 enum DwarfAttribute attr,
                                 enum DwarfForm form,
diff --git a/src/common/dwarf/dwarf2diehandler_unittest.cc b/src/common/dwarf/dwarf2diehandler_unittest.cc
index 6a731196..c0a532aa 100644
--- a/src/common/dwarf/dwarf2diehandler_unittest.cc
+++ b/src/common/dwarf/dwarf2diehandler_unittest.cc
@@ -51,7 +51,6 @@ using ::testing::Return;
 using ::testing::Sequence;
 using ::testing::StrEq;
 
-using dwarf2reader::AttributeList;
 using dwarf2reader::DIEDispatcher;
 using dwarf2reader::DIEHandler;
 using dwarf2reader::DwarfAttribute;
@@ -74,8 +73,7 @@ class MockDIEHandler: public DIEHandler {
   MOCK_METHOD3(ProcessAttributeSignature,
                void(DwarfAttribute, DwarfForm, uint64));
   MOCK_METHOD0(EndAttributes, bool());
-  MOCK_METHOD3(FindChildHandler, DIEHandler *(uint64, DwarfTag,
-                                              const AttributeList &));
+  MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64, DwarfTag));
   MOCK_METHOD0(Finish, void());
 };
 
@@ -94,11 +92,10 @@ class MockRootDIEHandler: public RootDIEHandler {
   MOCK_METHOD3(ProcessAttributeSignature,
                void(DwarfAttribute, DwarfForm, uint64));
   MOCK_METHOD0(EndAttributes, bool());
-  MOCK_METHOD3(FindChildHandler, DIEHandler *(uint64, DwarfTag,
-                                              const AttributeList &));
+  MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64, DwarfTag));
   MOCK_METHOD0(Finish, void());
   MOCK_METHOD5(StartCompilationUnit, bool(uint64, uint8, uint8, uint64, uint8));
-  MOCK_METHOD3(StartRootDIE, bool(uint64, DwarfTag, const AttributeList &));
+  MOCK_METHOD2(StartRootDIE, bool(uint64, DwarfTag));
 };
 
 // If the handler elects to skip the compilation unit, the dispatcher
@@ -129,18 +126,13 @@ TEST(Dwarf2DIEHandler, SkipRootDIE) {
   MockRootDIEHandler mock_root_handler;
   DIEDispatcher die_dispatcher(&mock_root_handler);
 
-  AttributeList mock_attribute_list;
-  mock_attribute_list.push_back(make_pair(dwarf2reader::DW_AT_name,
-                                          dwarf2reader::DW_FORM_string));
-
   EXPECT_CALL(mock_root_handler,
               StartCompilationUnit(0xde8994029fc8b999LL, 0xf4, 0x02,
                                    0xb00febffa76e2b2bLL, 0x5c))
       .InSequence(s)
       .WillOnce(Return(true));
   EXPECT_CALL(mock_root_handler,
-              StartRootDIE(0x7d08242b4b510cf2LL, (DwarfTag) 0xb4f98da6,
-                           ContainerEq(mock_attribute_list)))
+              StartRootDIE(0x7d08242b4b510cf2LL, (DwarfTag) 0xb4f98da6))
       .InSequence(s)
       .WillOnce(Return(false));
 
@@ -148,8 +140,7 @@ TEST(Dwarf2DIEHandler, SkipRootDIE) {
                                                   0xf4, 0x02,
                                                   0xb00febffa76e2b2bLL, 0x5c));
   EXPECT_FALSE(die_dispatcher.StartDIE(0x7d08242b4b510cf2LL,
-                                       (DwarfTag) 0xb4f98da6,
-                                       mock_attribute_list));
+                                       (DwarfTag) 0xb4f98da6));
   die_dispatcher.EndDIE(0x7d08242b4b510cf2LL);
 }
 
@@ -160,8 +151,6 @@ TEST(Dwarf2DIEHandler, SkipRootDIEChildren) {
   MockRootDIEHandler mock_root_handler;
   DIEDispatcher die_dispatcher(&mock_root_handler);
 
-  AttributeList mock_attribute_list;
-
   {
     InSequence s;
 
@@ -170,8 +159,7 @@ TEST(Dwarf2DIEHandler, SkipRootDIEChildren) {
                                      0x09f8bf0767f91675LL, 0xdb))
       .WillOnce(Return(true));
     EXPECT_CALL(mock_root_handler,
-                StartRootDIE(0x7d08242b4b510cf2LL, (DwarfTag) 0xb4f98da6,
-                             ContainerEq(mock_attribute_list)))
+                StartRootDIE(0x7d08242b4b510cf2LL, (DwarfTag) 0xb4f98da6))
       .WillOnce(Return(true));
     // Please don't tell me about my children.
     EXPECT_CALL(mock_root_handler, EndAttributes())
@@ -184,11 +172,9 @@ TEST(Dwarf2DIEHandler, SkipRootDIEChildren) {
                                                   0x26, 0xa0,
                                                   0x09f8bf0767f91675LL, 0xdb));
   EXPECT_TRUE(die_dispatcher.StartDIE(0x7d08242b4b510cf2LL,
-                                      (DwarfTag) 0xb4f98da6,
-                                      mock_attribute_list));
+                                      (DwarfTag) 0xb4f98da6));
   EXPECT_FALSE(die_dispatcher.StartDIE(0x435150ceedccda18LL,
-                                       (DwarfTag) 0xc3a17bba,
-                                       mock_attribute_list));
+                                       (DwarfTag) 0xc3a17bba));
   die_dispatcher.EndDIE(0x435150ceedccda18LL);
   die_dispatcher.EndDIE(0x7d08242b4b510cf2LL);
 }
@@ -199,9 +185,6 @@ TEST(Dwarf2DIEHandler, PassAttributeValues) {
   MockRootDIEHandler mock_root_handler;
   DIEDispatcher die_dispatcher(&mock_root_handler);
 
-  AttributeList mock_attribute_list;
-  mock_attribute_list.push_back(make_pair(dwarf2reader::DW_AT_name,
-                                          dwarf2reader::DW_FORM_string));
   const char buffer[10] = { 0x24, 0x24, 0x35, 0x9a, 0xca,
                             0xcf, 0xa8, 0x84, 0xa7, 0x18 };
   string str = "\xc8\x26\x2e\x0d\xa4\x9c\x37\xd6\xfb\x1d";
@@ -218,8 +201,7 @@ TEST(Dwarf2DIEHandler, PassAttributeValues) {
 
     // We'll like the root DIE.
     EXPECT_CALL(mock_root_handler,
-                StartRootDIE(0xe2222da01e29f2a9LL, (DwarfTag) 0x9829445c,
-                             ContainerEq(mock_attribute_list)))
+                StartRootDIE(0xe2222da01e29f2a9LL, (DwarfTag) 0x9829445c))
       .WillOnce(Return(true));
 
     // Expect some attribute values.
@@ -255,7 +237,7 @@ TEST(Dwarf2DIEHandler, PassAttributeValues) {
       .WillOnce(Return());
     EXPECT_CALL(mock_root_handler, EndAttributes())
       .WillOnce(Return(true));
-    EXPECT_CALL(mock_root_handler, FindChildHandler(_, _, _))
+    EXPECT_CALL(mock_root_handler, FindChildHandler(_, _))
       .Times(0);
     EXPECT_CALL(mock_root_handler, Finish())
       .WillOnce(Return());
@@ -270,8 +252,7 @@ TEST(Dwarf2DIEHandler, PassAttributeValues) {
                                                   0x66));
   // Report the root DIE.
   EXPECT_TRUE(die_dispatcher.StartDIE(0xe2222da01e29f2a9LL,
-                                      (DwarfTag) 0x9829445c,
-                                      mock_attribute_list));
+                                      (DwarfTag) 0x9829445c));
 
   // Report some attribute values.
   die_dispatcher.ProcessAttributeUnsigned(0xe2222da01e29f2a9LL,
@@ -309,25 +290,6 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
   MockDIEHandler *mock_child3_handler = new(MockDIEHandler);
   DIEDispatcher die_dispatcher(&mock_root_handler);
 
-  AttributeList root_attribute_list;
-  root_attribute_list.push_back(make_pair((DwarfAttribute) 0xb01185df,
-                                          (DwarfForm) 0xbc97cee8));
-  AttributeList child1_attribute_list;
-  child1_attribute_list.push_back(make_pair((DwarfAttribute) 0x41014e43,
-                                            (DwarfForm) 0x63155f4c));
-  AttributeList grandchild1_attribute_list;
-  grandchild1_attribute_list.push_back(make_pair((DwarfAttribute) 0xf72f823c,
-                                                 (DwarfForm) 0x0ff6a201));
-  AttributeList greatgrandchild1_attribute_list;
-  greatgrandchild1_attribute_list
-    .push_back(make_pair((DwarfAttribute) 0xbe66e5f0, (DwarfForm) 0xb4b24ff7));
-  AttributeList child2_attribute_list;
-  child1_attribute_list.push_back(make_pair((DwarfAttribute) 0xf22df14c,
-                                            (DwarfForm) 0x20676e7d));
-  AttributeList child3_attribute_list;
-  child3_attribute_list.push_back(make_pair((DwarfAttribute) 0xe8bf1201,
-                                            (DwarfForm) 0x53a5b7a8));
-
   {
     InSequence s;
 
@@ -340,8 +302,7 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
     // Root DIE.
     {
       EXPECT_CALL(mock_root_handler,
-                  StartRootDIE(0x15f0e06bdfe3c372LL, (DwarfTag) 0xf5d60c59,
-                               ContainerEq(root_attribute_list)))
+                  StartRootDIE(0x15f0e06bdfe3c372LL, (DwarfTag) 0xf5d60c59))
         .WillOnce(Return(true));
       EXPECT_CALL(mock_root_handler,
                   ProcessAttributeSigned((DwarfAttribute) 0xf779a642,
@@ -354,8 +315,7 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
       // First child DIE.
       EXPECT_CALL(mock_root_handler,
                   FindChildHandler(0x149f644f8116fe8cLL,
-                                   (DwarfTag) 0xac2cbd8c,
-                                   ContainerEq(child1_attribute_list)))
+                                   (DwarfTag) 0xac2cbd8c))
         .WillOnce(Return(mock_child1_handler));
       {
         EXPECT_CALL(*mock_child1_handler,
@@ -374,15 +334,13 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
       // for this child.
       EXPECT_CALL(mock_root_handler,
                   FindChildHandler(0x97412be24875de9dLL,
-                                   (DwarfTag) 0x505a068b,
-                                   ContainerEq(child2_attribute_list)))
+                                   (DwarfTag) 0x505a068b))
         .WillOnce(Return((DIEHandler *) NULL));
 
       // Third child DIE.
       EXPECT_CALL(mock_root_handler,
                   FindChildHandler(0x753c964c8ab538aeLL,
-                                   (DwarfTag) 0x8c22970e,
-                                   ContainerEq(child3_attribute_list)))
+                                   (DwarfTag) 0x8c22970e))
         .WillOnce(Return(mock_child3_handler));
       {
         EXPECT_CALL(*mock_child3_handler,
@@ -411,8 +369,7 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
   // Report the root DIE.
   {
     EXPECT_TRUE(die_dispatcher.StartDIE(0x15f0e06bdfe3c372LL,
-                                        (DwarfTag) 0xf5d60c59,
-                                        root_attribute_list));
+                                        (DwarfTag) 0xf5d60c59));
     die_dispatcher.ProcessAttributeSigned(0x15f0e06bdfe3c372LL,
                                           (DwarfAttribute) 0xf779a642,
                                           (DwarfForm) 0x2cb63027,
@@ -421,8 +378,7 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
     // First child DIE.
     {
       EXPECT_TRUE(die_dispatcher.StartDIE(0x149f644f8116fe8cLL,
-                                          (DwarfTag) 0xac2cbd8c,
-                                          child1_attribute_list));
+                                          (DwarfTag) 0xac2cbd8c));
       die_dispatcher.ProcessAttributeSigned(0x149f644f8116fe8cLL,
                                             (DwarfAttribute) 0xa6fd6f65,
                                             (DwarfForm) 0xe4f64c41,
@@ -431,15 +387,13 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
       // First grandchild DIE.  Will be skipped.
       {
         EXPECT_FALSE(die_dispatcher.StartDIE(0xd68de1ee0bd29419LL,
-                                            (DwarfTag) 0x22f05a15,
-                                            grandchild1_attribute_list));
+                                            (DwarfTag) 0x22f05a15));
         // First great-grandchild DIE.  Will be skipped without being
         // mentioned to any handler.
         {
           EXPECT_FALSE(die_dispatcher
                        .StartDIE(0xb3076285d25cac25LL,
-                                 (DwarfTag) 0xcff4061b,
-                                 greatgrandchild1_attribute_list));
+                                 (DwarfTag) 0xcff4061b));
           die_dispatcher.EndDIE(0xb3076285d25cac25LL);          
         }
         die_dispatcher.EndDIE(0xd68de1ee0bd29419LL);
@@ -450,16 +404,14 @@ TEST(Dwarf2DIEHandler, FindAndSkipChildren) {
     // Second child DIE.  Root handler will decline to find a handler for it.
     {
       EXPECT_FALSE(die_dispatcher.StartDIE(0x97412be24875de9dLL,
-                                           (DwarfTag) 0x505a068b,
-                                           child2_attribute_list));
+                                           (DwarfTag) 0x505a068b));
       die_dispatcher.EndDIE(0x97412be24875de9dLL);
     }
     
     // Third child DIE.
     {
       EXPECT_TRUE(die_dispatcher.StartDIE(0x753c964c8ab538aeLL,
-                                          (DwarfTag) 0x8c22970e,
-                                          child3_attribute_list));
+                                          (DwarfTag) 0x8c22970e));
       die_dispatcher.ProcessAttributeSigned(0x753c964c8ab538aeLL,
                                             (DwarfAttribute) 0x4e2b7cfb,
                                             (DwarfForm) 0x610b7ae1,
@@ -478,7 +430,6 @@ TEST(Dwarf2DIEHandler, FreeHandlersOnStack) {
   MockRootDIEHandler mock_root_handler;
   MockDIEHandler *mock_child_handler = new(MockDIEHandler);
   MockDIEHandler *mock_grandchild_handler = new(MockDIEHandler);
-  AttributeList empty_attribute_list;
 
   {
     InSequence s;
@@ -492,8 +443,7 @@ TEST(Dwarf2DIEHandler, FreeHandlersOnStack) {
     // Root DIE.
     {
       EXPECT_CALL(mock_root_handler,
-                  StartRootDIE(0xbf13b761691ddc91LL, (DwarfTag) 0x98980361,
-                               ContainerEq(empty_attribute_list)))
+                  StartRootDIE(0xbf13b761691ddc91LL, (DwarfTag) 0x98980361))
         .WillOnce(Return(true));
       EXPECT_CALL(mock_root_handler, EndAttributes())
         .WillOnce(Return(true));
@@ -501,8 +451,7 @@ TEST(Dwarf2DIEHandler, FreeHandlersOnStack) {
       // Child DIE.
       EXPECT_CALL(mock_root_handler,
                   FindChildHandler(0x058f09240c5fc8c9LL,
-                                   (DwarfTag) 0x898bf0d0,
-                                   ContainerEq(empty_attribute_list)))
+                                   (DwarfTag) 0x898bf0d0))
         .WillOnce(Return(mock_child_handler));
       {
         EXPECT_CALL(*mock_child_handler, EndAttributes())
@@ -511,8 +460,7 @@ TEST(Dwarf2DIEHandler, FreeHandlersOnStack) {
         // Grandchild DIE.
         EXPECT_CALL(*mock_child_handler,
                     FindChildHandler(0x32dc00c9945dc0c8LL,
-                                     (DwarfTag) 0x2802d007,
-                                     ContainerEq(empty_attribute_list)))
+                                     (DwarfTag) 0x2802d007))
           .WillOnce(Return(mock_grandchild_handler));
         {
           EXPECT_CALL(*mock_grandchild_handler,
@@ -548,20 +496,17 @@ TEST(Dwarf2DIEHandler, FreeHandlersOnStack) {
   // Report the root DIE.
   {
     EXPECT_TRUE(die_dispatcher.StartDIE(0xbf13b761691ddc91LL,
-                                        (DwarfTag) 0x98980361,
-                                        empty_attribute_list));
+                                        (DwarfTag) 0x98980361));
 
     // Child DIE.
     {
       EXPECT_TRUE(die_dispatcher.StartDIE(0x058f09240c5fc8c9LL,
-                                          (DwarfTag) 0x898bf0d0,
-                                          empty_attribute_list));
+                                          (DwarfTag) 0x898bf0d0));
 
       // Grandchild DIE.
       {
         EXPECT_TRUE(die_dispatcher.StartDIE(0x32dc00c9945dc0c8LL,
-                                            (DwarfTag) 0x2802d007,
-                                            empty_attribute_list));
+                                            (DwarfTag) 0x2802d007));
         die_dispatcher.ProcessAttributeSigned(0x32dc00c9945dc0c8LL,
                                               (DwarfAttribute) 0x4e2b7cfb,
                                               (DwarfForm) 0x610b7ae1,
diff --git a/src/common/dwarf/dwarf2reader.cc b/src/common/dwarf/dwarf2reader.cc
index 7c1a29dd..f1a07f0b 100644
--- a/src/common/dwarf/dwarf2reader.cc
+++ b/src/common/dwarf/dwarf2reader.cc
@@ -500,7 +500,7 @@ void CompilationUnit::ProcessDIEs() {
 
     const Abbrev& abbrev = abbrevs_->at(static_cast<size_t>(abbrev_num));
     const enum DwarfTag tag = abbrev.tag;
-    if (!handler_->StartDIE(absolute_offset, tag, abbrev.attributes)) {
+    if (!handler_->StartDIE(absolute_offset, tag)) {
       dieptr = SkipDIE(dieptr, abbrev);
     } else {
       dieptr = ProcessDIE(absolute_offset, dieptr, abbrev);
diff --git a/src/common/dwarf/dwarf2reader.h b/src/common/dwarf/dwarf2reader.h
index ecf4eb2a..8824bf90 100644
--- a/src/common/dwarf/dwarf2reader.h
+++ b/src/common/dwarf/dwarf2reader.h
@@ -342,8 +342,7 @@ class Dwarf2Handler {
 
   // Start to process a DIE at OFFSET from the beginning of the .debug_info
   // section. Return false if you would like to skip this DIE.
-  virtual bool StartDIE(uint64 offset, enum DwarfTag tag,
-                        const AttributeList& attrs) { return false; }
+  virtual bool StartDIE(uint64 offset, enum DwarfTag tag) { return false; }
 
   // Called when we have an attribute with unsigned data to give to our
   // handler. The attribute is for the DIE at OFFSET from the beginning of the
diff --git a/src/common/dwarf/dwarf2reader_die_unittest.cc b/src/common/dwarf/dwarf2reader_die_unittest.cc
index 96e95b7d..f8462a19 100644
--- a/src/common/dwarf/dwarf2reader_die_unittest.cc
+++ b/src/common/dwarf/dwarf2reader_die_unittest.cc
@@ -50,7 +50,6 @@ using google_breakpad::test_assembler::Section;
 using google_breakpad::test_assembler::kBigEndian;
 using google_breakpad::test_assembler::kLittleEndian;
 
-using dwarf2reader::AttributeList;
 using dwarf2reader::ByteReader;
 using dwarf2reader::CompilationUnit;
 using dwarf2reader::Dwarf2Handler;
@@ -76,8 +75,7 @@ class MockDwarf2Handler: public Dwarf2Handler {
   MOCK_METHOD5(StartCompilationUnit, bool(uint64 offset, uint8 address_size,
                                           uint8 offset_size, uint64 cu_length,
                                           uint8 dwarf_version));
-  MOCK_METHOD3(StartDIE, bool(uint64 offset, enum DwarfTag tag,
-                              const AttributeList& attrs));
+  MOCK_METHOD2(StartDIE, bool(uint64 offset, enum DwarfTag tag));
   MOCK_METHOD4(ProcessAttributeUnsigned, void(uint64 offset,
                                               DwarfAttribute attr,
                                               enum DwarfForm form,
@@ -115,7 +113,7 @@ struct DIEFixture {
 
     // Default expectations for the data handler.
     EXPECT_CALL(handler, StartCompilationUnit(_, _, _, _, _)).Times(0);
-    EXPECT_CALL(handler, StartDIE(_, _, _)).Times(0);
+    EXPECT_CALL(handler, StartDIE(_, _)).Times(0);
     EXPECT_CALL(handler, ProcessAttributeUnsigned(_, _, _, _)).Times(0);
     EXPECT_CALL(handler, ProcessAttributeSigned(_, _, _, _)).Times(0);
     EXPECT_CALL(handler, ProcessAttributeReference(_, _, _, _)).Times(0);
@@ -186,7 +184,7 @@ TEST_P(DwarfHeader, Header) {
                                      GetParam().format_size, _,
                                      GetParam().version))
         .WillOnce(Return(true));
-    EXPECT_CALL(handler, StartDIE(_, dwarf2reader::DW_TAG_compile_unit, _))
+    EXPECT_CALL(handler, StartDIE(_, dwarf2reader::DW_TAG_compile_unit))
         .WillOnce(Return(true));
     EXPECT_CALL(handler, ProcessAttributeString(_, dwarf2reader::DW_AT_name, 
                                                 dwarf2reader::DW_FORM_string,
@@ -262,7 +260,7 @@ struct DwarfFormsFixture: public DIEFixture {
                                      params.version))
         .InSequence(s)
         .WillOnce(Return(true));
-    EXPECT_CALL(handler, StartDIE(_, tag, _))
+    EXPECT_CALL(handler, StartDIE(_, tag))
         .InSequence(s)
         .WillOnce(Return(true));
   }
diff --git a/src/common/dwarf/functioninfo.cc b/src/common/dwarf/functioninfo.cc
index c0456224..69023bff 100644
--- a/src/common/dwarf/functioninfo.cc
+++ b/src/common/dwarf/functioninfo.cc
@@ -121,8 +121,7 @@ bool CUFunctionInfoHandler::StartCompilationUnit(uint64 offset,
 // subroutines. For line info, the DW_AT_stmt_list lives in the
 // compile unit tag.
 
-bool CUFunctionInfoHandler::StartDIE(uint64 offset, enum DwarfTag tag,
-                                     const AttributeList& attrs) {
+bool CUFunctionInfoHandler::StartDIE(uint64 offset, enum DwarfTag tag) {
   switch (tag) {
     case DW_TAG_subprogram:
     case DW_TAG_inlined_subroutine: {
diff --git a/src/common/dwarf/functioninfo.h b/src/common/dwarf/functioninfo.h
index f8706369..0b08a5fc 100644
--- a/src/common/dwarf/functioninfo.h
+++ b/src/common/dwarf/functioninfo.h
@@ -135,8 +135,7 @@ class CUFunctionInfoHandler: public Dwarf2Handler {
 
   // Start to process a DIE at OFFSET from the beginning of the
   // .debug_info section.  We only care about function related DIE's.
-  virtual bool StartDIE(uint64 offset, enum DwarfTag tag,
-                        const AttributeList& attrs);
+  virtual bool StartDIE(uint64 offset, enum DwarfTag tag);
 
   // Called when we have an attribute with unsigned data to give to
   // our handler.  The attribute is for the DIE at OFFSET from the