Fix warnings.

llvm-svn: 163573

6 files changed, 15 insertions, 38 deletions

diff --git a/lld/lib/ReaderWriter/ELF/ReaderELF.cpp b/lld/lib/ReaderWriter/ELF/ReaderELF.cpp
index f6281696293..b6d4978167b 100644
--- a/lld/lib/ReaderWriter/ELF/ReaderELF.cpp
+++ b/lld/lib/ReaderWriter/ELF/ReaderELF.cpp
@@ -492,9 +492,7 @@ private:
 
 class ReaderELF: public Reader {
 public:
-  ReaderELF(const ReaderOptionsELF &options) :
-    _options(options) {
-  }
+  ReaderELF(const ReaderOptionsELF &) {}
   error_code parseFile(std::unique_ptr<MemoryBuffer> mb, std::vector<
       std::unique_ptr<File> > &result) {
 
@@ -531,8 +529,6 @@ public:
     result.push_back(std::move(f));
     return error_code::success();
   }
-private:
-  const ReaderOptionsELF &_options;
 };
 
 } // namespace anonymous
diff --git a/lld/lib/ReaderWriter/Native/ReaderNative.cpp b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
index 29935e3d88c..bd0c17ab311 100644
--- a/lld/lib/ReaderWriter/Native/ReaderNative.cpp
+++ b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
@@ -896,16 +896,12 @@ inline void NativeReferenceV1::setAddend(Addend a) {
 
 class Reader : public lld::Reader {
 public:
-  Reader(const ReaderOptionsNative &options) : _options(options) {
-  }
+  Reader(const ReaderOptionsNative &options) {}
   
   virtual error_code parseFile(std::unique_ptr<MemoryBuffer> mb, 
                                std::vector<std::unique_ptr<lld::File>> &result) {
     return File::make(mb, mb->getBufferIdentifier(), result);
   }
-
-private:
-  const ReaderOptionsNative &_options;
 };
 
 
diff --git a/lld/lib/ReaderWriter/Native/WriterNative.cpp b/lld/lib/ReaderWriter/Native/WriterNative.cpp
index e3dc04351de..50969a6a51b 100644
--- a/lld/lib/ReaderWriter/Native/WriterNative.cpp
+++ b/lld/lib/ReaderWriter/Native/WriterNative.cpp
@@ -28,8 +28,7 @@ namespace native {
 ///
 class Writer : public lld::Writer {
 public:
-  Writer(const WriterOptionsNative &options) : _options(options) {
-  }
+  Writer(const WriterOptionsNative &options) {}
   
   virtual error_code writeFile(const lld::File &file, StringRef outPath) {
     // reserve first byte for unnamed atoms
@@ -523,7 +522,6 @@ private:
   typedef llvm::DenseMap<const Atom*, uint32_t> TargetToIndex;
   typedef llvm::DenseMap<Reference::Addend, uint32_t> AddendToIndex;
 
-  const WriterOptionsNative              &_options;
   NativeFileHeader*                       _headerBuffer;
   size_t                                  _headerBufferSize;
   std::vector<char>                       _stringPool;
diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
index 06610b344f9..89ec2ff8328 100644
--- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
@@ -359,8 +359,7 @@ private:
 
 class ReaderCOFF : public Reader {
 public:
-  ReaderCOFF(const ReaderOptionsPECOFF &options) : _options(options) {
-  }
+  ReaderCOFF(const ReaderOptionsPECOFF &options) {}
 
   error_code parseFile(std::unique_ptr<MemoryBuffer> mb,
                        std::vector<std::unique_ptr<File>> &result) {
@@ -373,8 +372,6 @@ public:
     result.push_back(std::move(f));
     return error_code::success();
   }
-private:
-  const ReaderOptionsPECOFF &_options;
 };
 
 } // namespace anonymous
diff --git a/lld/lib/ReaderWriter/YAML/ReaderYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderYAML.cpp
index f566da3d900..72536a45773 100644
--- a/lld/lib/ReaderWriter/YAML/ReaderYAML.cpp
+++ b/lld/lib/ReaderWriter/YAML/ReaderYAML.cpp
@@ -345,12 +345,11 @@ private:
 class YAMLUndefinedAtom : public UndefinedAtom {
 public:
   YAMLUndefinedAtom( YAMLFile &f
-                   , int32_t ord
+                   , int32_t
                    , StringRef name
                    , UndefinedAtom::CanBeNull cbn)
     : _file(f)
     , _name(name)
-    , _ordinal(ord)
     , _canBeNull(cbn) {
   }
 
@@ -369,7 +368,6 @@ public:
 private:
   YAMLFile                &_file;
   StringRef                _name;
-  uint32_t                 _ordinal;
   UndefinedAtom::CanBeNull _canBeNull;
 };
 
@@ -381,13 +379,12 @@ private:
 class YAMLSharedLibraryAtom : public SharedLibraryAtom {
 public:
   YAMLSharedLibraryAtom( YAMLFile &f
-                       , int32_t ord
+                       , int32_t
                        , StringRef name
                        , StringRef loadName
                        , bool cbn)
     : _file(f)
     , _name(name)
-    , _ordinal(ord)
     , _loadName(loadName)
     , _canBeNull(cbn) {
   }
@@ -411,7 +408,6 @@ public:
 private:
   YAMLFile &_file;
   StringRef _name;
-  uint32_t  _ordinal;
   StringRef _loadName;
   bool      _canBeNull;
 };
@@ -423,10 +419,9 @@ private:
 ///
 class YAMLAbsoluteAtom : public AbsoluteAtom {
 public:
-  YAMLAbsoluteAtom(YAMLFile &f, int32_t ord, StringRef name, uint64_t v)
+  YAMLAbsoluteAtom(YAMLFile &f, int32_t, StringRef name, uint64_t v)
     : _file(f)
     , _name(name)
-    , _ordinal(ord)
     , _value(v) {
   }
 
@@ -445,7 +440,6 @@ public:
 private:
   YAMLFile &_file;
   StringRef _name;
-  uint32_t  _ordinal;
   uint64_t  _value;
 };
 
diff --git a/lld/tools/lld-core/TestingHelpers.hpp b/lld/tools/lld-core/TestingHelpers.hpp
index 9e373585c7f..f6abb4f0df3 100644
--- a/lld/tools/lld-core/TestingHelpers.hpp
+++ b/lld/tools/lld-core/TestingHelpers.hpp
@@ -35,11 +35,10 @@ using namespace lld;
 //
 class TestingStubAtom : public DefinedAtom {
 public:
-        TestingStubAtom(const File& f, const Atom& shlib) :
-                        _file(f), _shlib(shlib) {
-          static uint32_t lastOrdinal = 0;
-          _ordinal = lastOrdinal++; 
-        }
+  TestingStubAtom(const File &F, const Atom&) : _file(F) {
+    static uint32_t lastOrdinal = 0;
+    _ordinal = lastOrdinal++; 
+  }
 
   virtual const File& file() const {
     return _file;
@@ -122,7 +121,6 @@ public:
   
 private:
   const File&               _file;
-  const Atom&               _shlib;
   uint32_t                  _ordinal;
 };
 
@@ -134,11 +132,10 @@ private:
 //
 class TestingGOTAtom : public DefinedAtom {
 public:
-        TestingGOTAtom(const File& f, const Atom& shlib) :
-                        _file(f), _shlib(shlib) {
-          static uint32_t lastOrdinal = 0;
-          _ordinal = lastOrdinal++; 
-        }
+  TestingGOTAtom(const File &F, const Atom&) : _file(F) {
+    static uint32_t lastOrdinal = 0;
+    _ordinal = lastOrdinal++; 
+  }
 
   virtual const File& file() const {
     return _file;
@@ -221,7 +218,6 @@ public:
   
 private:
   const File&               _file;
-  const Atom&               _shlib;
   uint32_t                  _ordinal;
 };