RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-15 07:59:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix an ASAN failure introduced with r225537 (adding the -universal-headers to llvm-obdump).

Browse Source 
And a fly by fix to some formatting issues with the same commit.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225550 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kevin Enderby 2015-01-09 21:55:03 +00:00
parent 64fe6cce3e
commit 2ca895612c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/llvm-objdump/MachODump.cpp
View File

@ -475,12 +475,12 @@ static void printMachOUniversalHeaders(const object::MachOUniversalBinary *UB,
MachOUniversalBinary::ObjectForArch other_OFA(UB, j);
uint32_t other_cputype = other_OFA.getCPUType();
uint32_t other_cpusubtype = other_OFA.getCPUSubType();
if (cputype != 0 && cpusubtype != 0 &&
cputype == other_cputype &&
if (cputype != 0 && cpusubtype != 0 && cputype == other_cputype &&
(cpusubtype & ~MachO::CPU_SUBTYPE_MASK) ==
(other_cpusubtype & ~MachO::CPU_SUBTYPE_MASK))
(other_cpusubtype & ~MachO::CPU_SUBTYPE_MASK)) {
outs() << "(illegal duplicate architecture) ";
break;
}
}
if (verbose) {
outs() << OFA.getArchTypeName() << "\n";
@ -611,11 +611,11 @@ void llvm::ParseInputMachO(StringRef Filename) {
// No architecture flags were specified so if this contains a slice that
// matches the host architecture dump only that.
if (!ArchAll) {
StringRef HostArchName = MachOObjectFile::getHostArch().getArchName();
for (MachOUniversalBinary::object_iterator I = UB->begin_objects(),
E = UB->end_objects();
I != E; ++I) {
if (HostArchName == I->getArchTypeName()) {
if (MachOObjectFile::getHostArch().getArchName() ==
I->getArchTypeName()) {
ErrorOr<std::unique_ptr<ObjectFile>> ObjOrErr = I->getAsObjectFile();
std::string ArchiveName;
ArchiveName.clear();