[llvm-branch-commits] [compiler-rt-branch] r197010 - Merging r196809:

[Bill Wendling]

Author: void
Date: Wed Dec 11 00:14:02 2013
New Revision: 197010

URL: http://llvm.org/viewvc/llvm-project?rev=197010&view=rev
Log:
Merging r196809:
------------------------------------------------------------------------
r196809 | rsmith | 2013-12-09 11:52:39 -0800 (Mon, 09 Dec 2013) | 2 lines

Unbreak build by adding an implementation of PopStackFrames function.

------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_34/   (props changed)
    compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_stacktrace.cc

Propchange: compiler-rt/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 11 00:14:02 2013
@@ -1 +1 @@
-/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791,196501,196612,196799
+/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791,196501,196612,196799,196809

Modified: compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_stacktrace.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_stacktrace.cc?rev=197010&r1=197009&r2=197010&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_stacktrace.cc (original)
+++ compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_stacktrace.cc Wed Dec 11 00:14:02 2013
@@ -158,6 +158,14 @@ static bool MatchPc(uptr cur_pc, uptr tr
   return cur_pc - trace_pc <= threshold || trace_pc - cur_pc <= threshold;
 }
 
+void StackTrace::PopStackFrames(uptr count) {
+  CHECK(count < size);
+  size -= count;
+  for (uptr i = 0; i < size; ++i) {
+    trace[i] = trace[i + count];
+  }
+}
+
 uptr StackTrace::LocatePcInTrace(uptr pc) {
   // Use threshold to find PC in stack trace, as PC we want to unwind from may
   // slightly differ from return address in the actual unwinded stack trace.