Make MemoryObject accessor members const again

llvm-svn: 151687

4 files changed, 6 insertions, 7 deletions

diff --git a/llvm/tools/llvm-mc/Disassembler.cpp b/llvm/tools/llvm-mc/Disassembler.cpp
index 32fc2ba57d3..8114580cb94 100644
--- a/llvm/tools/llvm-mc/Disassembler.cpp
+++ b/llvm/tools/llvm-mc/Disassembler.cpp
@@ -42,9 +42,9 @@ public:
   VectorMemoryObject(const ByteArrayTy &bytes) : Bytes(bytes) {}
 
   uint64_t getBase() const { return 0; }
-  uint64_t getExtent() { return Bytes.size(); }
+  uint64_t getExtent() const { return Bytes.size(); }
 
-  int readByte(uint64_t Addr, uint8_t *Byte) {
+  int readByte(uint64_t Addr, uint8_t *Byte) const {
     if (Addr >= getExtent())
       return -1;
     *Byte = Bytes[Addr].first;
@@ -365,4 +365,3 @@ int Disassembler::disassembleEnhanced(const std::string &TS,
 
   return 0;
 }
-
diff --git a/llvm/tools/llvm-objdump/MCFunction.cpp b/llvm/tools/llvm-objdump/MCFunction.cpp
index 9a9edda753d..5c67f1b70a9 100644
--- a/llvm/tools/llvm-objdump/MCFunction.cpp
+++ b/llvm/tools/llvm-objdump/MCFunction.cpp
@@ -28,7 +28,7 @@ using namespace llvm;
 
 MCFunction
 MCFunction::createFunctionFromMC(StringRef Name, const MCDisassembler *DisAsm,
-                                 MemoryObject &Region, uint64_t Start,
+                                 const MemoryObject &Region, uint64_t Start,
                                  uint64_t End, const MCInstrAnalysis *Ana,
                                  raw_ostream &DebugOut,
                                  SmallVectorImpl<uint64_t> &Calls) {
diff --git a/llvm/tools/llvm-objdump/MCFunction.h b/llvm/tools/llvm-objdump/MCFunction.h
index c0362d3a43f..6d3a548d48e 100644
--- a/llvm/tools/llvm-objdump/MCFunction.h
+++ b/llvm/tools/llvm-objdump/MCFunction.h
@@ -79,7 +79,7 @@ public:
   // Create an MCFunction from a region of binary machine code.
   static MCFunction
   createFunctionFromMC(StringRef Name, const MCDisassembler *DisAsm,
-                       MemoryObject &Region, uint64_t Start, uint64_t End,
+                       const MemoryObject &Region, uint64_t Start, uint64_t End,
                        const MCInstrAnalysis *Ana, raw_ostream &DebugOut,
                        SmallVectorImpl<uint64_t> &Calls);
 
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h
index 1611516ab77..aa71b77c8ab 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.h
+++ b/llvm/tools/llvm-objdump/llvm-objdump.h
@@ -31,9 +31,9 @@ public:
   StringRefMemoryObject(StringRef bytes) : Bytes(bytes) {}
 
   uint64_t getBase() const { return 0; }
-  uint64_t getExtent() { return Bytes.size(); }
+  uint64_t getExtent() const { return Bytes.size(); }
 
-  int readByte(uint64_t Addr, uint8_t *Byte) {
+  int readByte(uint64_t Addr, uint8_t *Byte) const {
     if (Addr >= getExtent())
       return -1;
     *Byte = Bytes[Addr];