From 24c359d32937bc99e3c818cce14939a2b31b6563 Mon Sep 17 00:00:00 2001
From: Roman Margold <rmargold@chromium.org>
Date: Wed, 1 Feb 2017 16:26:39 -0800
Subject: Revert "Several fixes for broken Mac build"

This reverts commit 5c521532fc0a1b65f42c0d61d2da206eadf318b8.
---
 src/google_breakpad/processor/minidump.h | 4 ++--
 src/processor/minidump.cc                | 2 +-
 src/processor/stackwalker_mips.cc        | 6 +++---
 src/tools/mac/dump_syms/macho_dump.cc    | 9 +++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/google_breakpad/processor/minidump.h b/src/google_breakpad/processor/minidump.h
index 25a871ad..bff38bf3 100644
--- a/src/google_breakpad/processor/minidump.h
+++ b/src/google_breakpad/processor/minidump.h
@@ -836,7 +836,7 @@ class MinidumpUnloadedModuleList : public MinidumpStream,
   const MinidumpUnloadedModule*
       GetModuleAtIndex(unsigned int index) const override;
   const CodeModules* Copy() const override;
-  vector<linked_ptr<const CodeModule> > GetShrunkRangeModules() const override;
+  vector<linked_ptr<const CodeModule>> GetShrunkRangeModules() const override;
   bool IsModuleShrinkEnabled() const override;
 
  protected:
@@ -850,7 +850,7 @@ class MinidumpUnloadedModuleList : public MinidumpStream,
   static const uint32_t kStreamType = MD_UNLOADED_MODULE_LIST_STREAM;
 
 
-  bool Read(uint32_t expected_size_) override;
+  bool Read(uint32_t expected_size_);
 
   // The largest number of modules that will be read from a minidump.  The
   // default is 1024.
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index 439bb45f..c9fa4d81 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -3885,7 +3885,7 @@ const CodeModules* MinidumpUnloadedModuleList::Copy() const {
   return new BasicCodeModules(this);
 }
 
-vector<linked_ptr<const CodeModule> >
+vector<linked_ptr<const CodeModule>>
 MinidumpUnloadedModuleList::GetShrunkRangeModules() const {
   return vector<linked_ptr<const CodeModule> >();
 }
diff --git a/src/processor/stackwalker_mips.cc b/src/processor/stackwalker_mips.cc
index 65b7c35a..db55d460 100644
--- a/src/processor/stackwalker_mips.cc
+++ b/src/processor/stackwalker_mips.cc
@@ -56,8 +56,8 @@ StackwalkerMIPS::StackwalkerMIPS(const SystemInfo* system_info,
 : Stackwalker(system_info, memory, modules, resolver_helper),
   context_(context) {
   if (context_->context_flags & MD_CONTEXT_MIPS64 ) {
-    if (memory_ && ((memory_->GetBase() + memory_->GetSize() - 1)
-        > 0xffffffffffffffff)) {
+    if ((memory_ && memory_->GetBase() + memory_->GetSize() - 1)
+        > 0xffffffffffffffff) {
       BPLOG(ERROR) << "Memory out of range for stackwalking mips64: "
           << HexString(memory_->GetBase())
           << "+"
@@ -65,7 +65,7 @@ StackwalkerMIPS::StackwalkerMIPS(const SystemInfo* system_info,
       memory_ = NULL;
     }
   } else {
-    if (memory_ && ((memory_->GetBase() + memory_->GetSize() - 1) > 0xffffffff)) {
+    if ((memory_ && memory_->GetBase() + memory_->GetSize() - 1) > 0xffffffff) {
       BPLOG(ERROR) << "Memory out of range for stackwalking mips32: "
           << HexString(memory_->GetBase())
           << "+"
diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
index 0263ed5e..d882bbe8 100644
--- a/src/tools/mac/dump_syms/macho_dump.cc
+++ b/src/tools/mac/dump_syms/macho_dump.cc
@@ -140,12 +140,13 @@ void DumpFile(const char *filename) {
   size_t object_files_size;
   const SuperFatArch* super_fat_object_files =
       fat_reader.object_files(&object_files_size);
+  struct fat_arch *object_files;
+  if (!super_fat_object_files->ConvertToFatArch(object_files)) {
+    exit(1);
+  }
   printf("  object file count: %ld\n", object_files_size);
   for (size_t i = 0; i < object_files_size; i++) {
-    struct fat_arch file;
-    if (!super_fat_object_files->ConvertToFatArch(&file)) {
-      exit(1);
-    }
+    const struct fat_arch &file = object_files[i];
     const NXArchInfo *fat_arch_info =
         google_breakpad::BreakpadGetArchInfoFromCpuType(
             file.cputype, file.cpusubtype);
-- 
cgit v1.2.1