From d5493af818fb03d387a5412f9112dc56f0583e8b Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Mon, 25 Apr 2022 23:18:30 +0000
Subject: [PATCH] IWYU: add utility for std::exchange

Bug: 957519
Change-Id: I307d520fdc34d2452018ed32a505e7e519739410
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
Reviewed-by: Wez <wez@chromium.org>
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#995855}
---
 .../symbolize/patches/0001-expose-object-file-helpers.patch    | 3 ++-
 base/third_party/symbolize/symbolize.h                         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch b/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch
index b7376d89816..72900a197ba 100644
--- a/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch
+++ b/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch
@@ -111,25 +111,26 @@ index 803cde7c5fa31..27c025eabbc30 100644
      object_fd = OpenObjectFileContainingPcAndGetStartAddress(pc0, start_address,
                                                               base_address,
 +                                                             end_address,
                                                               out + 1,
                                                               out_size - 1);
    }
 diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
 index c6f9ec4360ede..00cfa022219e6 100644
 --- a/base/third_party/symbolize/symbolize.h
 +++ b/base/third_party/symbolize/symbolize.h
-@@ -60,6 +60,8 @@
+@@ -60,6 +60,9 @@
  
  #ifdef HAVE_SYMBOLIZE
  
 +#include <algorithm>
++#include <utility>
 +
  #if defined(__ELF__)  // defined by gcc
  #if defined(__OpenBSD__)
  #include <sys/exec_elf.h>
 @@ -99,6 +101,44 @@ _START_GOOGLE_NAMESPACE_
  bool GetSectionHeaderByName(int fd, const char *name, size_t name_len,
                              ElfW(Shdr) *out);
  
 +int OpenObjectFileContainingPcAndGetStartAddress(uint64_t pc,
 +                                                 uint64_t& start_address,
diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
index 99029a968d5..278078f6071 100644
--- a/base/third_party/symbolize/symbolize.h
+++ b/base/third_party/symbolize/symbolize.h
@@ -54,20 +54,21 @@
 #ifndef BASE_SYMBOLIZE_H_
 #define BASE_SYMBOLIZE_H_
 
 #include "utilities.h"
 #include "config.h"
 #include "glog/logging.h"
 
 #ifdef HAVE_SYMBOLIZE
 
 #include <algorithm>
+#include <utility>
 
 #if defined(__ELF__)  // defined by gcc
 #if defined(__OpenBSD__)
 #include <sys/exec_elf.h>
 #else
 #include <elf.h>
 #endif
 
 #if !defined(ANDROID)
 #include <link.h>  // For ElfW() macro.
-- 
2.25.4