<html><head><meta http-equiv="Content-Type" content="text/html charset=windows-1252"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Okay. It’s in there now.<div><br></div><div>-bw</div><div><br><div><div>On Dec 9, 2013, at 12:03 PM, Chandler Carruth <<a href="mailto:chandlerc@gmail.com">chandlerc@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div dir="ltr">Bill, you should also pull this patch into the 3.4 branch to fix the build after the prior commit I asked to be merged.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Dec 9, 2013 at 11:52 AM, Richard Smith <span dir="ltr"><<a href="mailto:richard-llvm@metafoo.co.uk" target="_blank">richard-llvm@metafoo.co.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Mon Dec 9 13:52:39 2013<br>
New Revision: 196809<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=196809&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=196809&view=rev</a><br>
Log:<br>
Unbreak build by adding an implementation of PopStackFrames function.<br>
<br>
Modified:<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc?rev=196809&r1=196808&r2=196809&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc?rev=196809&r1=196808&r2=196809&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc Mon Dec 9 13:52:39 2013<br>
@@ -147,6 +147,14 @@ static bool MatchPc(uptr cur_pc, uptr tr<br>
return cur_pc - trace_pc <= threshold || trace_pc - cur_pc <= threshold;<br>
}<br>
<br>
+void StackTrace::PopStackFrames(uptr count) {<br>
+ CHECK(count < size);<br>
+ size -= count;<br>
+ for (uptr i = 0; i < size; ++i) {<br>
+ trace[i] = trace[i + count];<br>
+ }<br>
+}<br>
+<br>
uptr StackTrace::LocatePcInTrace(uptr pc) {<br>
// Use threshold to find PC in stack trace, as PC we want to unwind from may<br>
// slightly differ from return address in the actual unwinded stack trace.<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h?rev=196809&r1=196808&r2=196809&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h?rev=196809&r1=196808&r2=196809&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h Mon Dec 9 13:52:39 2013<br>
@@ -68,6 +68,7 @@ struct StackTrace {<br>
void FastUnwindStack(uptr pc, uptr bp, uptr stack_top, uptr stack_bottom,<br>
uptr max_depth);<br>
void SlowUnwindStack(uptr pc, uptr max_depth);<br>
+ void PopStackFrames(uptr count);<br>
uptr LocatePcInTrace(uptr pc);<br>
};<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</blockquote></div><br></div></body></html>