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

1 files changed, 18 insertions, 122 deletions

diff --git a/src/common/dwarf_cu_to_module_unittest.cc b/src/common/dwarf_cu_to_module_unittest.cc
index 377630e3..e71d344b 100644
--- a/src/common/dwarf_cu_to_module_unittest.cc
+++ b/src/common/dwarf_cu_to_module_unittest.cc
@@ -42,7 +42,6 @@
 using std::make_pair;
 using std::vector;
 
-using dwarf2reader::AttributeList;
 using dwarf2reader::DIEHandler;
 using dwarf2reader::DwarfTag;
 using dwarf2reader::DwarfAttribute;
@@ -177,11 +176,7 @@ class CUFixtureBase {
   // this.root_handler_.EndAttributes, but not this.root_handler_.Finish.
   void StartCU();
 
-  // Add some strange attributes/form pairs to the end of ATTRS.
-  void PushBackStrangeAttributes(dwarf2reader::AttributeList *attrs);
-
   // Have HANDLER process some strange attribute/form/value triples.
-  // These will match those promised by PushBackStrangeAttributes.
   void ProcessStrangeAttributes(dwarf2reader::DIEHandler *handler);
 
   // Start a child DIE of PARENT with the given tag and name. Leave
@@ -329,20 +324,8 @@ void CUFixtureBase::StartCU() {
               .StartCompilationUnit(0x51182ec307610b51ULL, 0x81, 0x44,
                                     0x4241b4f33720dd5cULL, 3));
   {
-    dwarf2reader::AttributeList attrs;
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                              dwarf2reader::DW_FORM_strp));
-    if (!lines_.empty())
-      attrs.push_back(make_pair(dwarf2reader::DW_AT_stmt_list,
-                                dwarf2reader::DW_FORM_ref4));
-    if (language_ != dwarf2reader::DW_LANG_none)
-      attrs.push_back(make_pair(dwarf2reader::DW_AT_language,
-                                language_signed_
-                                ? dwarf2reader::DW_FORM_sdata 
-                                : dwarf2reader::DW_FORM_udata));
     ASSERT_TRUE(root_handler_.StartRootDIE(0x02e56bfbda9e7337ULL,
-                                           dwarf2reader::DW_TAG_compile_unit,
-                                           attrs));
+                                           dwarf2reader::DW_TAG_compile_unit));
   }
   root_handler_.ProcessAttributeString(dwarf2reader::DW_AT_name,
                                        dwarf2reader::DW_FORM_strp,
@@ -364,20 +347,6 @@ void CUFixtureBase::StartCU() {
   ASSERT_TRUE(root_handler_.EndAttributes());
 }
 
-void CUFixtureBase::PushBackStrangeAttributes(
-    dwarf2reader::AttributeList *attrs) {
-  attrs->push_back(make_pair((DwarfAttribute) 0xf560dead,
-                             (DwarfForm) 0x4106e4db));
-  attrs->push_back(make_pair((DwarfAttribute) 0x85380095,
-                             (DwarfForm) 0x0f16fe87));
-  attrs->push_back(make_pair((DwarfAttribute) 0xf7f7480f,
-                             (DwarfForm) 0x829e038a));
-  attrs->push_back(make_pair((DwarfAttribute) 0xa55ffb51,
-                             (DwarfForm) 0x2f43b041));
-  attrs->push_back(make_pair((DwarfAttribute) 0x2fde304a,
-                             (DwarfForm) 0x895ffa23));
-}
-
 void CUFixtureBase::ProcessStrangeAttributes(
     dwarf2reader::DIEHandler *handler) {
   handler->ProcessAttributeUnsigned((DwarfAttribute) 0xf560dead,
@@ -401,12 +370,8 @@ void CUFixtureBase::ProcessStrangeAttributes(
 DIEHandler *CUFixtureBase::StartNamedDIE(DIEHandler *parent,
                                          DwarfTag tag,
                                          const string &name) {
-  dwarf2reader::AttributeList attrs;
-  attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                            dwarf2reader::DW_FORM_strp));
-  PushBackStrangeAttributes(&attrs);
   dwarf2reader::DIEHandler *handler
-    = parent->FindChildHandler(0x8f4c783c0467c989ULL, tag, attrs);
+    = parent->FindChildHandler(0x8f4c783c0467c989ULL, tag);
   if (!handler)
     return NULL;
   handler->ProcessAttributeString(dwarf2reader::DW_AT_name,
@@ -426,14 +391,8 @@ DIEHandler *CUFixtureBase::StartSpecifiedDIE(DIEHandler *parent,
                                              DwarfTag tag,
                                              uint64 specification,
                                              const char *name) {
-  dwarf2reader::AttributeList attrs;
-  if (name)
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                              dwarf2reader::DW_FORM_strp));
-  attrs.push_back(make_pair(dwarf2reader::DW_AT_specification,
-                            dwarf2reader::DW_FORM_ref4));
   dwarf2reader::DIEHandler *handler
-    = parent->FindChildHandler(0x8f4c783c0467c989ULL, tag, attrs);
+    = parent->FindChildHandler(0x8f4c783c0467c989ULL, tag);
   if (!handler)
     return NULL;
   if (name)
@@ -456,18 +415,9 @@ void CUFixtureBase::DefineFunction(dwarf2reader::DIEHandler *parent,
                                    const string &name, Module::Address address,
                                    Module::Address size,
                                    const char* mangled_name) {
-  dwarf2reader::AttributeList func_attrs;
-  func_attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                                 dwarf2reader::DW_FORM_strp));
-  func_attrs.push_back(make_pair(dwarf2reader::DW_AT_low_pc,
-                                 dwarf2reader::DW_FORM_addr));
-  func_attrs.push_back(make_pair(dwarf2reader::DW_AT_high_pc,
-                                 dwarf2reader::DW_FORM_addr));
-  PushBackStrangeAttributes(&func_attrs);
   dwarf2reader::DIEHandler *func
       = parent->FindChildHandler(0xe34797c7e68590a8LL,
-                                 dwarf2reader::DW_TAG_subprogram,
-                                 func_attrs);
+                                 dwarf2reader::DW_TAG_subprogram);
   ASSERT_TRUE(func != NULL);
   func->ProcessAttributeString(dwarf2reader::DW_AT_name,
                                dwarf2reader::DW_FORM_strp,
@@ -493,15 +443,7 @@ void CUFixtureBase::DeclarationDIE(DIEHandler *parent, uint64 offset,
                                    DwarfTag tag,
                                    const string &name,
                                    const string &mangled_name) {
-  dwarf2reader::AttributeList attrs;
-  if (!name.empty())
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                              dwarf2reader::DW_FORM_strp));
-
-
-  attrs.push_back(make_pair(dwarf2reader::DW_AT_declaration,
-                            dwarf2reader::DW_FORM_flag));
-  dwarf2reader::DIEHandler *die = parent->FindChildHandler(offset, tag, attrs);
+  dwarf2reader::DIEHandler *die = parent->FindChildHandler(offset, tag);
   ASSERT_TRUE(die != NULL);
   if (!name.empty())
     die->ProcessAttributeString(dwarf2reader::DW_AT_name,
@@ -526,20 +468,8 @@ void CUFixtureBase::DefinitionDIE(DIEHandler *parent,
                                   const string &name,
                                   Module::Address address,
                                   Module::Address size) {
-  dwarf2reader::AttributeList attrs;
-  attrs.push_back(make_pair(dwarf2reader::DW_AT_specification,
-                            dwarf2reader::DW_FORM_ref4));
-  if (!name.empty())
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                              dwarf2reader::DW_FORM_strp));
-  if (size) {
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_low_pc,
-                              dwarf2reader::DW_FORM_addr));
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_high_pc,
-                              dwarf2reader::DW_FORM_addr));
-  }
   dwarf2reader::DIEHandler *die
-    = parent->FindChildHandler(0x6ccfea031a9e6cc9ULL, tag, attrs);
+    = parent->FindChildHandler(0x6ccfea031a9e6cc9ULL, tag);
   ASSERT_TRUE(die != NULL);
   die->ProcessAttributeReference(dwarf2reader::DW_AT_specification,
                                  dwarf2reader::DW_FORM_ref4,
@@ -567,16 +497,8 @@ void CUFixtureBase::AbstractInstanceDIE(DIEHandler *parent,
                                         uint64 specification,
                                         const string &name,
                                         DwarfForm form) {
-  dwarf2reader::AttributeList attrs;
-  if (specification != 0ULL)
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_specification,
-                              dwarf2reader::DW_FORM_ref4));
-  attrs.push_back(make_pair(dwarf2reader::DW_AT_inline, form));
-  if (!name.empty())
-    attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                              dwarf2reader::DW_FORM_strp));
   dwarf2reader::DIEHandler *die
-    = parent->FindChildHandler(offset, dwarf2reader::DW_TAG_subprogram, attrs);
+    = parent->FindChildHandler(offset, dwarf2reader::DW_TAG_subprogram);
   ASSERT_TRUE(die != NULL);
   if (specification != 0ULL)
     die->ProcessAttributeReference(dwarf2reader::DW_AT_specification,
@@ -602,21 +524,9 @@ void CUFixtureBase::DefineInlineInstanceDIE(DIEHandler *parent,
                                             uint64 origin, 
                                             Module::Address address,
                                             Module::Address size) {
-  dwarf2reader::AttributeList func_attrs;
-  if (!name.empty())
-    func_attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                                   dwarf2reader::DW_FORM_strp));
-  func_attrs.push_back(make_pair(dwarf2reader::DW_AT_low_pc,
-                                 dwarf2reader::DW_FORM_addr));
-  func_attrs.push_back(make_pair(dwarf2reader::DW_AT_high_pc,
-                                 dwarf2reader::DW_FORM_addr));
-  func_attrs.push_back(make_pair(dwarf2reader::DW_AT_abstract_origin,
-                                 dwarf2reader::DW_FORM_ref4));
-  PushBackStrangeAttributes(&func_attrs);
   dwarf2reader::DIEHandler *func
       = parent->FindChildHandler(0x11c70f94c6e87ccdLL,
-                                 dwarf2reader::DW_TAG_subprogram,
-                                 func_attrs);
+                                 dwarf2reader::DW_TAG_subprogram);
   ASSERT_TRUE(func != NULL);
   if (!name.empty()) {
     func->ProcessAttributeString(dwarf2reader::DW_AT_name,
@@ -731,22 +641,19 @@ TEST_F(SimpleCU, MangledName) {
 
 TEST_F(SimpleCU, IrrelevantRootChildren) {
   StartCU();
-  dwarf2reader::AttributeList no_attrs;
   EXPECT_FALSE(root_handler_
                .FindChildHandler(0x7db32bff4e2dcfb1ULL,
-                                 dwarf2reader::DW_TAG_lexical_block, no_attrs));
+                                 dwarf2reader::DW_TAG_lexical_block));
 }
 
 TEST_F(SimpleCU, IrrelevantNamedScopeChildren) {
   StartCU();
-  dwarf2reader::AttributeList no_attrs;
   DIEHandler *class_A_handler
     = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type, "class_A");
   EXPECT_TRUE(class_A_handler != NULL);
   EXPECT_FALSE(class_A_handler
                ->FindChildHandler(0x02e55999b865e4e9ULL,
-                                  dwarf2reader::DW_TAG_lexical_block, 
-                                  no_attrs));
+                                  dwarf2reader::DW_TAG_lexical_block));
   delete class_A_handler;
 }
 
@@ -1478,7 +1385,6 @@ TEST_F(Specifications, InterCU) {
   EXPECT_CALL(reporter_, UncoveredFunction(_)).WillOnce(Return());
   MockLineToModuleFunctor lr;
   EXPECT_CALL(lr, mock_apply(_,_,_,_)).Times(0);
-  dwarf2reader::AttributeList no_attrs;
 
   // Kludge: satisfy reporter_'s expectation.
   reporter_.SetCUName("compilation-unit-name");
@@ -1487,10 +1393,8 @@ TEST_F(Specifications, InterCU) {
   {
     DwarfCUToModule root1_handler(&fc, &lr, &reporter_);
     ASSERT_TRUE(root1_handler.StartCompilationUnit(0, 1, 2, 3, 3));
-    dwarf2reader::AttributeList attrs;
-    PushBackStrangeAttributes(&attrs);
-    ASSERT_TRUE(root1_handler.StartRootDIE(1, dwarf2reader::DW_TAG_compile_unit,
-                                           attrs));
+    ASSERT_TRUE(root1_handler.StartRootDIE(1,
+                                           dwarf2reader::DW_TAG_compile_unit));
     ProcessStrangeAttributes(&root1_handler);
     ASSERT_TRUE(root1_handler.EndAttributes());
     DeclarationDIE(&root1_handler, 0xb8fbfdd5f0b26fceULL,
@@ -1502,8 +1406,8 @@ TEST_F(Specifications, InterCU) {
   {
     DwarfCUToModule root2_handler(&fc, &lr, &reporter_);
     ASSERT_TRUE(root2_handler.StartCompilationUnit(0, 1, 2, 3, 3));
-    ASSERT_TRUE(root2_handler.StartRootDIE(1, dwarf2reader::DW_TAG_compile_unit,
-                                           no_attrs));
+    ASSERT_TRUE(root2_handler.StartRootDIE(1,
+                                           dwarf2reader::DW_TAG_compile_unit));
     ASSERT_TRUE(root2_handler.EndAttributes());
     DIEHandler *class_A_handler
       = StartSpecifiedDIE(&root2_handler, dwarf2reader::DW_TAG_class_type,
@@ -1519,8 +1423,8 @@ TEST_F(Specifications, InterCU) {
   {
     DwarfCUToModule root3_handler(&fc, &lr, &reporter_);
     ASSERT_TRUE(root3_handler.StartCompilationUnit(0, 1, 2, 3, 3));
-    ASSERT_TRUE(root3_handler.StartRootDIE(1, dwarf2reader::DW_TAG_compile_unit,
-                                           no_attrs));
+    ASSERT_TRUE(root3_handler.StartRootDIE(1,
+                                           dwarf2reader::DW_TAG_compile_unit));
     ASSERT_TRUE(root3_handler.EndAttributes());
     DefinitionDIE(&root3_handler, dwarf2reader::DW_TAG_subprogram,
                   0xb01fef8b380bd1a2ULL, "",
@@ -1635,14 +1539,8 @@ TEST_F(CUErrors, BadStmtList) {
   ASSERT_TRUE(root_handler_
               .StartCompilationUnit(0xc591d5b037543d7cULL, 0x11, 0xcd,
                                     0x2d7d19546cf6590cULL, 3));
-  dwarf2reader::AttributeList attrs;
-  attrs.push_back(make_pair(dwarf2reader::DW_AT_name,
-                            dwarf2reader::DW_FORM_strp));
-  attrs.push_back(make_pair(dwarf2reader::DW_AT_stmt_list,
-                            dwarf2reader::DW_FORM_ref4));
   ASSERT_TRUE(root_handler_.StartRootDIE(0xae789dc102cfca54ULL,
-                                         dwarf2reader::DW_TAG_compile_unit,
-                                         attrs));
+                                         dwarf2reader::DW_TAG_compile_unit));
   root_handler_.ProcessAttributeString(dwarf2reader::DW_AT_name,
                                        dwarf2reader::DW_FORM_strp,
                                        "compilation-unit-name");
@@ -1698,10 +1596,8 @@ TEST_F(CUErrors, BadCURootDIETag) {
                .StartCompilationUnit(0xadf6e0eb71e2b0d9ULL, 0x4d, 0x90,
                                      0xc9de224ccb99ac3eULL, 3));
 
-  dwarf2reader::AttributeList no_attrs;
   ASSERT_FALSE(root_handler_.StartRootDIE(0x02e56bfbda9e7337ULL,
-                                          dwarf2reader::DW_TAG_subprogram,
-                                          no_attrs));
+                                          dwarf2reader::DW_TAG_subprogram));
 }
 
 // Tests for DwarfCUToModule::Reporter. These just produce (or fail to