[lld] r207884 - Remove dead code.

Rui Ueyama ruiu at google.com
Fri May 2 16:44:00 PDT 2014


Author: ruiu
Date: Fri May  2 18:43:59 2014
New Revision: 207884

URL: http://llvm.org/viewvc/llvm-project?rev=207884&view=rev
Log:
Remove dead code.

isAlias always returns false and no one is using it. It was
originally added Atom to query if an atom is an alias for another
atom, assuming that alias atoms are different from normal atoms.

We now support atom aliasing, but the way that's implemented is
in a different way than what isAlias assumed. An alias atom is
just a regular defined atom with no content, and it has a layout-
before edge to alias-to atom so that they are layed out at the
same location in the result. So this is dead code, and it doesn't
make much sense to keep it.

Modified:
    lld/trunk/include/lld/Core/DefinedAtom.h
    lld/trunk/include/lld/ReaderWriter/Simple.h
    lld/trunk/lib/ReaderWriter/CoreLinkingContext.cpp
    lld/trunk/lib/ReaderWriter/ELF/Atoms.h
    lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
    lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp
    lld/trunk/lib/ReaderWriter/PECOFF/Atoms.h
    lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp

Modified: lld/trunk/include/lld/Core/DefinedAtom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/DefinedAtom.h?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/DefinedAtom.h (original)
+++ lld/trunk/include/lld/Core/DefinedAtom.h Fri May  2 18:43:59 2014
@@ -270,12 +270,6 @@ public:
   /// is R__.
   virtual ContentPermissions permissions() const;
 
-  /// \brief means this is a zero size atom that exists to provide an alternate
-  /// name for another atom.  Alias atoms must have a special Reference to the
-  /// atom they alias which the layout engine recognizes and forces the alias
-  /// atom to layout right before the target atom.
-  virtual bool isAlias() const = 0;
-
   /// \brief returns a reference to the raw (unrelocated) bytes of this Atom's
   /// content.
   virtual ArrayRef<uint8_t> rawContent() const = 0;

Modified: lld/trunk/include/lld/ReaderWriter/Simple.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/Simple.h?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/Simple.h (original)
+++ lld/trunk/include/lld/ReaderWriter/Simple.h Fri May  2 18:43:59 2014
@@ -140,8 +140,6 @@ public:
     return DefinedAtom::deadStripNormal;
   }
 
-  bool isAlias() const override { return false; }
-
   DefinedAtom::reference_iterator begin() const override {
     uintptr_t index = 0;
     const void *it = reinterpret_cast<const void *>(index);

Modified: lld/trunk/lib/ReaderWriter/CoreLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/CoreLinkingContext.cpp?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/CoreLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/CoreLinkingContext.cpp Fri May  2 18:43:59 2014
@@ -63,8 +63,6 @@ public:
     return DefinedAtom::permR_X;
   }
 
-  bool isAlias() const override { return false; }
-
   ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
 
   reference_iterator begin() const override {
@@ -128,8 +126,6 @@ public:
     return DefinedAtom::permRW_;
   }
 
-  bool isAlias() const override { return false; }
-
   ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
 
   reference_iterator begin() const override {
@@ -273,4 +269,3 @@ void CoreLinkingContext::addPasses(PassM
 }
 
 Writer &CoreLinkingContext::writer() const { return *_writer; }
-

Modified: lld/trunk/lib/ReaderWriter/ELF/Atoms.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Atoms.h?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Atoms.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Atoms.h Fri May  2 18:43:59 2014
@@ -381,9 +381,6 @@ public:
     }
   }
 
-  // FIXME: Not Sure if ELF supports alias atoms. Find out more.
-  bool isAlias() const override { return false; }
-
   ArrayRef<uint8_t> rawContent() const override { return _contentData; }
 
   DefinedAtom::reference_iterator begin() const override {
@@ -487,8 +484,6 @@ public:
 
   virtual bool isThumb() const { return false; }
 
-  bool isAlias() const override { return false; }
-
   ArrayRef<uint8_t> rawContent() const override { return _contentData; }
 
   DefinedAtom::reference_iterator begin() const override {
@@ -571,8 +566,6 @@ public:
 
   ContentPermissions permissions() const override { return permRW_; }
 
-  bool isAlias() const override { return false; }
-
   ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
 
   DefinedAtom::reference_iterator begin() const override {

Modified: lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp (original)
+++ lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp Fri May  2 18:43:59 2014
@@ -98,10 +98,6 @@ public:
      return (DefinedAtom::ContentPermissions)(attributes().permissions);
   }
 
-  bool isAlias() const override {
-     return (attributes().alias != 0);
-  }
-
   ArrayRef<uint8_t> rawContent() const override;
 
   reference_iterator begin() const override;

Modified: lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp (original)
+++ lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp Fri May  2 18:43:59 2014
@@ -431,7 +431,6 @@ private:
     attrs.deadStrip         = atom.deadStrip();
     attrs.dynamicExport     = atom.dynamicExport();
     attrs.permissions       = atom.permissions();
-    attrs.alias             = atom.isAlias();
     return attrs;
   }
 

Modified: lld/trunk/lib/ReaderWriter/PECOFF/Atoms.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/Atoms.h?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/Atoms.h (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/Atoms.h Fri May  2 18:43:59 2014
@@ -105,7 +105,6 @@ public:
     return sectionPositionAny;
   }
   DeadStripKind deadStrip() const override { return deadStripNormal; }
-  bool isAlias() const override { return false; }
 
   Kind getKind() const { return _kind; }
 

Modified: lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp?rev=207884&r1=207883&r2=207884&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp (original)
+++ lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp Fri May  2 18:43:59 2014
@@ -892,7 +892,6 @@ template <> struct MappingTraits<const l
     DeadStripKind deadStrip() const override { return _deadStrip; }
     DynamicExport dynamicExport() const override { return _dynamicExport; }
     ContentPermissions permissions() const override { return _permissions; }
-    bool isAlias() const override { return false; }
     bool isGroupChild() const { return _isGroupChild; }
     ArrayRef<uint8_t> rawContent() const override {
       if (!occupiesDiskSpace())





More information about the llvm-commits mailing list