[llvm] r178985 - Remove two uses of getObject.
Rafael Espindola
rafael.espindola at gmail.com
Sun Apr 7 08:46:05 PDT 2013
Author: rafael
Date: Sun Apr 7 10:46:05 2013
New Revision: 178985
URL: http://llvm.org/viewvc/llvm-project?rev=178985&view=rev
Log:
Remove two uses of getObject.
Modified:
llvm/trunk/include/llvm/Object/MachO.h
llvm/trunk/lib/Object/MachOObjectFile.cpp
llvm/trunk/tools/llvm-readobj/MachODumper.cpp
Modified: llvm/trunk/include/llvm/Object/MachO.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=178985&r1=178984&r2=178985&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/MachO.h (original)
+++ llvm/trunk/include/llvm/Object/MachO.h Sun Apr 7 10:46:05 2013
@@ -160,6 +160,7 @@ public:
getSymbol64TableEntry(DataRefImpl DRI) const;
const MachOFormat::SymbolTableEntry *
getSymbolTableEntry(DataRefImpl DRI) const;
+ bool is64Bit() const;
const MachOObject *getObject() const { return MachOObj.get(); }
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=178985&r1=178984&r2=178985&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Sun Apr 7 10:46:05 2013
@@ -41,6 +41,9 @@ MachOObjectFile::MachOObjectFile(MemoryB
}
}
+bool MachOObjectFile::is64Bit() const {
+ return MachOObj->is64Bit();
+}
ObjectFile *ObjectFile::createMachOObjectFile(MemoryBuffer *Buffer) {
error_code ec;
Modified: llvm/trunk/tools/llvm-readobj/MachODumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/MachODumper.cpp?rev=178985&r1=178984&r2=178985&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/MachODumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/MachODumper.cpp Sun Apr 7 10:46:05 2013
@@ -157,20 +157,10 @@ namespace {
};
}
-static bool is64BitLoadCommand(const MachOObject *MachOObj, DataRefImpl DRI) {
- LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(DRI.d.a);
- if (LCI.Command.Type == macho::LCT_Segment64)
- return true;
- assert(LCI.Command.Type == macho::LCT_Segment && "Unexpected Type.");
- return false;
-}
-
static void getSection(const MachOObjectFile *Obj,
DataRefImpl DRI,
MachOSection &Section) {
- const MachOObject *MachOObj = Obj->getObject();
-
- if (is64BitLoadCommand(MachOObj, DRI)) {
+ if (Obj->is64Bit()) {
const MachOFormat::Section64 *Sect = Obj->getSection64(DRI);
Section.Address = Sect->Address;
@@ -200,8 +190,7 @@ static void getSection(const MachOObject
static void getSymbol(const MachOObjectFile *Obj,
DataRefImpl DRI,
MachOSymbol &Symbol) {
- const MachOObject *MachOObj = Obj->getObject();
- if (MachOObj->is64Bit()) {
+ if (Obj->is64Bit()) {
const MachOFormat::Symbol64TableEntry *Entry =
Obj->getSymbol64TableEntry( DRI);
Symbol.StringIndex = Entry->StringIndex;
More information about the llvm-commits
mailing list