From: Mark Wielaard <mjw@redhat.com>
Date: Thu, 13 Jan 2011 12:09:31 +0000 (+0100)
Subject: Remove unused output-shape from dwarf_output collector.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8f5a7d9725e882eed142722a4b9e097c16fd88f;p=thirdparty%2Felfutils.git

Remove unused output-shape from dwarf_output collector.
---

diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 279e85995..3fcfdb71d 100644
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -101,7 +101,7 @@ libdwpp_a_SOURCES = c++/values.cc \
 		    c++/known.cc \
 		    c++/line_info.cc \
 		    c++/edit-values.cc \
-		    c++/output-values.cc c++/output-shape.cc
+		    c++/output-values.cc
 
 if MAINTAINER_MODE
 BUILT_SOURCES = $(srcdir)/known-dwarf.h
diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index b7bbaadc9..9d0f67829 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -994,39 +994,6 @@ namespace elfutils
       return &x;
     }
 
-    struct shape_type
-    {
-      typedef std::vector<std::pair<int, int> > attrs_type;
-      attrs_type _m_attrs;
-      bool _m_has_children;
-      size_t _m_hash;
-
-      friend class subr::hashed_hasher<shape_type>;
-      typedef subr::hashed_hasher<shape_type> hasher;
-
-      inline void hashnadd (int name, int form);
-      inline shape_type (const die_type &die, bool last_sibling);
-
-      inline bool operator== (const shape_type &other) const
-      {
-	return (_m_hash == other._m_hash
-		&& _m_has_children == other._m_has_children
-		&& _m_attrs == other._m_attrs);
-      }
-      inline bool operator!= (const shape_type &other) const
-      {
-	return !(*this == other);
-      }
-    };
-
-    typedef subr::nothing shape_info;
-
-    typedef std::tr1::unordered_map<shape_type, shape_info,
-				    shape_type::hasher> shape_map;
-    shape_map _m_shapes;
-
-    void add_shape (die_type &die, bool last_sibling);
-
     struct stats_cmp
       : public std::binary_function<const die_map::value_type *,
 				    const die_map::value_type *,
diff --git a/libdw/c++/output-shape.cc b/libdw/c++/output-shape.cc
deleted file mode 100644
index 8d25b3899..000000000
--- a/libdw/c++/output-shape.cc
+++ /dev/null
@@ -1,159 +0,0 @@
-/* elfutils::dwarf_output abbrev generation.
-   Copyright (C) 2009 Red Hat, Inc.
-   This file is part of Red Hat elfutils.
-
-   Red Hat elfutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by the
-   Free Software Foundation; version 2 of the License.
-
-   Red Hat elfutils is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with Red Hat elfutils; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
-
-   In addition, as a special exception, Red Hat, Inc. gives You the
-   additional right to link the code of Red Hat elfutils with code licensed
-   under any Open Source Initiative certified open source license
-   (http://www.opensource.org/licenses/index.php) which requires the
-   distribution of source code with any binary distribution and to
-   distribute linked combinations of the two.  Non-GPL Code permitted under
-   this exception must only link to the code of Red Hat elfutils through
-   those well defined interfaces identified in the file named EXCEPTION
-   found in the source code files (the "Approved Interfaces").  The files
-   of Non-GPL Code may instantiate templates or use macros or inline
-   functions from the Approved Interfaces without causing the resulting
-   work to be covered by the GNU General Public License.  Only Red Hat,
-   Inc. may make changes or additions to the list of Approved Interfaces.
-   Red Hat's grant of this exception is conditioned upon your not adding
-   any new exceptions.  If you wish to add a new Approved Interface or
-   exception, please contact Red Hat.  You must obey the GNU General Public
-   License in all respects for all of the Red Hat elfutils code and other
-   code used in conjunction with Red Hat elfutils except the Non-GPL Code
-   covered by this exception.  If you modify this file, you may extend this
-   exception to your version of the file, but you are not obligated to do
-   so.  If you do not wish to provide this exception without modification,
-   you must delete this exception statement from your version and license
-   this file solely under the GPL without exception.
-
-   Red Hat elfutils is an included package of the Open Invention Network.
-   An included package of the Open Invention Network is a package for which
-   Open Invention Network licensees cross-license their patents.  No patent
-   license is granted, either expressly or impliedly, by designation as an
-   included package.  Should you wish to participate in the Open Invention
-   Network licensing program, please visit www.openinventionnetwork.com
-   <http://www.openinventionnetwork.com>.  */
-
-#include <config.h>
-#include "dwarf_output"
-
-using namespace elfutils;
-
-static inline int
-attr_form (int tag, const dwarf_output::attribute &attr)
-{
-  switch (attr.second.what_space ())
-    {
-    case dwarf::VS_address:
-      return DW_FORM_addr;
-
-    case dwarf::VS_flag:
-      return DW_FORM_flag;
-
-    case dwarf::VS_reference:
-      return DW_FORM_ref_addr;
-
-    case dwarf::VS_string:
-    case dwarf::VS_identifier:
-      return DW_FORM_string;
-
-    case dwarf::VS_constant:
-      if (! attr.second.constant_is_integer ())
-	return DW_FORM_block;
-      /* Fall through.  */
-
-    case dwarf::VS_dwarf_constant:
-    case dwarf::VS_source_line:
-    case dwarf::VS_source_column:
-      return DW_FORM_udata;
-
-    case dwarf::VS_location:
-      if (!attr.second.location ().is_list ())
-	return DW_FORM_block;
-      /* Fall through.  */
-
-    case dwarf::VS_lineptr:
-    case dwarf::VS_macptr:
-    case dwarf::VS_rangelistptr:
-      /* For class *ptr (including loclistptr), the one of data[48] that
-	 matches offset_size is the only form encoding to use.  Other data*
-	 forms can mean the attribute is class constant instead.  */
-      return DW_FORM_data4;
-
-    case dwarf::VS_source_file:
-      switch (attr.first)
-	{
-	case DW_AT_decl_file:
-	case DW_AT_call_file:
-	  return DW_FORM_udata;
-
-	case DW_AT_comp_dir:
-	  return DW_FORM_string;
-
-	case DW_AT_name:
-	  switch (tag)
-	    {
-	    case DW_TAG_compile_unit:
-	    case DW_TAG_partial_unit:
-	      return DW_FORM_string;
-	    }
-	  break;
-	}
-      throw std::runtime_error ("source_file value unexpected in "
-				+ to_string (attr));
-
-    case dwarf::VS_discr_list:
-      return DW_FORM_block;
-    }
-
-  throw std::logic_error ("strange value_space");
-}
-
-inline void
-dwarf_output_collector::shape_type::hashnadd (int name, int form)
-{
-  subr::hash_combine (_m_hash, name);
-  subr::hash_combine (_m_hash, form);
-  _m_attrs.push_back (std::make_pair (name, form));
-}
-
-inline
-dwarf_output_collector::shape_type::shape_type (const die_type &die,
-						bool last_sibling)
-  : _m_has_children (die.has_children ()), _m_hash (8675309 << _m_has_children)
-{
-  if (!last_sibling)
-    hashnadd (DW_AT_sibling, DW_FORM_ref_udata);
-
-  for (die_type::attributes_type::const_iterator it = die.attributes ().begin ();
-       it != die.attributes ().end ();
-       ++it)
-    hashnadd (it->first, attr_form (die.tag (), *it));
-}
-#if 0
-void
-dwarf_output_collector::add_shape (die_type &die, bool last_sibling)
-{
-  assert (die._m_shape == NULL);
-
-  shape_map::value_type &x
-    = *_m_shapes.insert (std::make_pair (shape_type (die, last_sibling),
-					 shape_info ())).first;
-  // x.second.nusers++, etc.
-
-  die._m_shape = &x;
-}
-#endif