Link stack frames of JNI stubs to JNI callbacks.

base/debug/stack_trace.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/stack_trace.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <sstream>
 
+#include "base/logging.h"
 #include "base/macros.h"
 
 #if HAVE_TRACE_STACK_FRAME_POINTERS
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
 #include <pthread.h>
 #include "base/process/process_handle.h"
 #include "base/threading/platform_thread.h"
 #endif
 
@@ skipping 147 matching lines @@
       if (IsStackFrameValid(next2_fp, next_fp, stack_end)) {
         return fp;
       }
     }
   }
 #endif  // defined(OS_LINUX)
 
   return 0;
 }
 
+// Links stack frame |fp| to |parent_fp|, so that during stack unwinding
+// TraceStackFramePointers() visits |parent_fp| after visiting |fp|.
+// Both frame pointers must come from __builtin_frame_address().
+// Returns previous stack frame |fp| was linked to.
+void* LinkStackFrames(void* fpp, void* parent_fp) {
+  uintptr_t fp = reinterpret_cast<uintptr_t>(fpp) - kStackFrameAdjustment;
+  void* prev_parent_fp = reinterpret_cast<void**>(fp)[0];
+  reinterpret_cast<void**>(fp)[0] = parent_fp;
+  return prev_parent_fp;
+}
+
 #endif  // HAVE_TRACE_STACK_FRAME_POINTERS
 
 }  // namespace
 
 StackTrace::StackTrace(const void* const* trace, size_t count) {
   count = std::min(count, arraysize(trace_));
   if (count)
     memcpy(trace_, trace, count * sizeof(trace_[0]));
   count_ = count;
 }
@@ skipping 49 matching lines @@
       continue;
     }
 
     // Failed to find next frame.
     break;
   }
 
   return depth;
 }
 
+ScopedStackFrameLinker::ScopedStackFrameLinker(void* fp, void* parent_fp)
+  : fp_(fp), parent_fp_(parent_fp)
+  , original_parent_fp_(LinkStackFrames(fp, parent_fp)) {}

[Nico, 2016/10/25 19:36:33]

please run `git cl format`

+
+ScopedStackFrameLinker::~ScopedStackFrameLinker() {
+  void* previous_parent_fp = LinkStackFrames(fp_, original_parent_fp_);
+  CHECK_EQ(parent_fp_, previous_parent_fp)
+    << "Stack frame's parent pointer has changed!";
+}
+
 #endif  // HAVE_TRACE_STACK_FRAME_POINTERS
 
 }  // namespace debug
 }  // namespace base