commit 721108fd54d961e54afd4e4da2e9a29838389990
author Mike Frysinger <vapier@chromium.org> Wed Jul 15 02:20:48 2020 -0400
committer Mike Frysinger <vapier@chromium.org> Thu Jul 16 03:04:43 2020 +0000
tree b3281768e1f51c3070f709e6ddb0a45d35e58841
parent 09b056975dacd1f0f815ad820b6dc9913b0118a3

fix NDEBUG breakage with new dwarf5 code

These fields are only used when NDEBUG is not defined.  We get build
failures with the current code like:
src/common/dwarf/dwarf2reader.h:181:12: error: private field 'string_buffer_length_' is not used [-Werror,-Wunused-private-field]
  uint64_t string_buffer_length_;

Change-Id: I01d6e29d31d50e29ed3736e7197e70455724ae48
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2299022
Reviewed-by: Sterling Augustine <saugustine@google.com>

src/common/dwarf/dwarf2reader.h

diff --git a/src/common/dwarf/dwarf2reader.h b/src/common/dwarf/dwarf2reader.h
index 83cd676..e405e3a 100644
--- a/src/common/dwarf/dwarf2reader.h
+++ b/src/common/dwarf/dwarf2reader.h
@@ -178,9 +178,13 @@
   // Convenience pointers into .debug_str and .debug_line_str. These exactly
   // correspond to those in the compilation unit.
   const uint8_t* string_buffer_;
+#ifndef NDEBUG
   uint64_t string_buffer_length_;
+#endif
   const uint8_t* line_string_buffer_;
+#ifndef NDEBUG
   uint64_t line_string_buffer_length_;
+#endif
 
   const uint8_t* after_header_;
 };