From: Julian Seward <jseward@acm.org>
Date: Mon, 29 Jan 2018 11:58:33 +0000 (+0100)
Subject: arm: fix build failure introduced with "Bug 79362 - Debug info ...".
X-Git-Tag: VALGRIND_3_14_0~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c1953a863796ba1b8e88d953954ea041949ae9c;p=thirdparty%2Fvalgrind.git

arm: fix build failure introduced with "Bug 79362 - Debug info ...".
---

diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index 949512e778..24f1409ddb 100644
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -915,10 +915,11 @@ static Bool in_same_fn ( Addr a1, Addr a2 )
    const HChar *buf_a1, *buf_a2;
    /* The following conditional looks grossly inefficient and
       surely could be majorly improved, with not much effort. */
-   if (VG_(get_fnname_raw) (a1, &buf_a1)) {
+   const DiEpoch cur_ep = VG_(current_DiEpoch)();
+   if (VG_(get_fnname_raw) (cur_ep, a1, &buf_a1)) {
       HChar buf_a1_copy[VG_(strlen)(buf_a1) + 1];
       VG_(strcpy)(buf_a1_copy, buf_a1);
-      if (VG_(get_fnname_raw) (a2, &buf_a2))
+      if (VG_(get_fnname_raw) (cur_ep, a2, &buf_a2))
          if (VG_(strcmp)(buf_a1_copy, buf_a2))
             return True;
    }