commit 0cf02f2b548a03b5219f3697d561a69f73b53f50
author Saleem Abdulrasool <compnerd@compnerd.org> Fri May 15 14:43:19 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Aug 28 11:16:57 2020 -0700
tree 953300bf43c9052001776efd7630755450a79248
parent 4974bf7e1b30777aa31c42dc9d96222d15b6d7c4

unwind: fix unwind build without heap

Add a missing guard for `_LIBUNWIND_NO_HEAP` around code dealing with the
`.cfi_remember_state` and `.cfi_restore_state` instructions.

Patch by Amanieu d'Antras!

GitOrigin-RevId: b31cb3aa5ee7ea92d830b06a0a7e42c7f2791dd4

src/DwarfParser.hpp

diff --git a/src/DwarfParser.hpp b/src/DwarfParser.hpp
index 4a64c21..d05ac46 100644
--- a/src/DwarfParser.hpp
+++ b/src/DwarfParser.hpp
@@ -401,6 +401,7 @@
                         fdeInfo.fdeStart + fdeInfo.fdeLength, cieInfo,
                         upToPC - fdeInfo.pcStart, rememberStack, arch, results);
 
+#if !defined(_LIBUNWIND_NO_HEAP)
   // Clean up rememberStack. Even in the case where every DW_CFA_remember_state
   // is paired with a DW_CFA_restore_state, parseInstructions can skip restore
   // opcodes if it reaches the target PC and stops interpreting, so we have to
@@ -410,6 +411,7 @@
     free(rememberStack);
     rememberStack = next;
   }
+#endif
 
   return returnValue;
 }