<div dir="ltr">Attached is an intermediate patch that passes my tests (also attached). Few questions: <div><br></div><div>The patch gets a bit too verbose and it has a few repetitions, e.g. we have this snippet repeated multiple times:</div>
<div><div>+ __annotate_contiguous_container(data(), data() + capacity(),</div><div>+ data() + size(), data() + size() + 1);</div><div><br></div><div>WDYT about adding a private method to vector like this (and a couple more)?</div>
<div><br></div><div>void __annotate_size_increase(size_t __n) {</div><div><div> __annotate_contiguous_container(data(), data() + capacity(),</div><div> data() + size(), data() + size() + __n);</div>
</div><div>}</div><div><br></div><div>In order to test the annotation properly I need to do something like this as often as possible: </div><div><div>template <class T> void TestVector(std::vector<T> &v) { </div>
<div> if (v.capacity() == 0) return; </div><div> char *beg = (char*)&v.front(); </div><div> char *end = beg + v.capacity() * sizeof(T); </div>
<div> char *mid = beg + v.size() * sizeof(T); </div><div> for (char *p = beg; p < mid; p++) </div><div> assert(!__asan_address_is_poisoned(p)); </div>
<div> for (char *p = mid ; p < end; p++) </div><div> assert(__asan_address_is_poisoned(p)); </div><div>} </div>
</div><div><br></div><div>Is it possible to add code like this as another private method of vector (under some ifdef)?</div><div><br></div><div>--kcc </div></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Tue, Nov 19, 2013 at 1:57 PM, Kostya Serebryany <span dir="ltr"><<a href="mailto:kcc@google.com" target="_blank">kcc@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div class="im"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div><div><br>
> Do you like the idea?<br>
<br>
</div></div>Yes - very much so.<br>
<div><br>
> Any comments about the prototype patch?<br>
<br>
</div>Yes.<br>
<br>
1) I would implement it with inline functions other than macros.<br>
<br>
Like this:<br>
<br>
<br>
extern "C" void __sanitizer_annotate_contiguous_container(void *, void *, void *, void *);<br>
void inline __annotate_contiguous container<br>
( const void *__beg, const void *__end, const void *__old_mid, const void *new_mid )<br>
#if __has_feature(address_sanitizer)<br>
{ __sanitizer_annotate_contiguous_container(beg, end, old_mid, new_mid); }<br>
#else<br>
{}<br>
#endif<br></blockquote><div><br></div></div><div>Makes sense, see below. </div><div>We''l probably want to move __annotate_contiguous container into a separate file so that both string and vector use it.</div><div>
But let's do the whole thing with vector before moving to string. </div><div class="im">
<div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
2) I'd like more information about what __sanitizer_annotate_contiguous_container does ;-)<br></blockquote><div><br></div></div><div>In short, it [un]poisons the parts of shadow memory that correspond to the container's memory. </div>
<div>More details in compiler-rt files: include/sanitizer/common_interface_defs.h and lib/asan/asan_poisoning.cc</div><div class="im"><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div><br>
> Any suggestion how to test these annotations in libc++ (we need some kind of DEATH tests)?<br>
<br>
</div>We already have failing tests in libc++.<br>
they are named XXXX.fail.cpp.<br></blockquote><div><br></div></div><div>These are tests that fail to compile. </div><div>for asan annotations we need tests that build and run, and then either fail at run-time or check the state of shadow. </div>
<div>Like these:</div><div><div>compiler-rt/lib/asan/lit_tests/TestCases/contiguous_container.cc</div><div>compiler-rt/lib/asan/lit_tests/TestCases/contiguous_container_crash.cc</div></div><div><br></div><div>Suggestions?</div>
<div><br></div><div>--kcc </div><div><br></div><div><div>--- include/vector (revision 195116)</div><div>+++ include/vector (working copy)</div><div>@@ -288,6 +288,16 @@</div><div> </div><div> _LIBCPP_BEGIN_NAMESPACE_STD</div>
<div> </div><div>+extern "C" void __sanitizer_annotate_contiguous_container(</div><div>+ const void *, const void *, const void *, const void *);</div><div>+void inline __annotate_contiguous_container</div><div>
+ (const void *__beg, const void *__end, const void *__old_mid, const void *__new_mid)</div><div>+#if __has_feature(address_sanitizer)</div><div>+ { __sanitizer_annotate_contiguous_container(__beg, __end, __old_mid, __new_mid); }</div>
<div>+#else</div><div>+ {}</div><div>+#endif</div><div>+</div><div> template <bool></div><div> class __vector_base_common</div><div> {</div><div>@@ -1525,7 +1535,12 @@</div><div class="im"><div> // __v.push_back(_VSTD::forward<_Up>(__x));</div>
<div> __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_), _VSTD::forward<_Up>(__x));</div><div> __v.__end_++;</div><div>+ if (data())</div></div><div>+ __annotate_contiguous_container(</div>
<div class="im">
<div>+ data(), data() + capacity(), data() + size(), data() + capacity());</div><div> __swap_out_circular_buffer(__v);</div></div><div>+ __annotate_contiguous_container(data(), data() + capacity(),</div><div class="im">
<div>+ data() + capacity(), data() + size());</div>
<div> }</div><div> </div></div></div><div><br></div><div><br></div></div></div></div>
</blockquote></div><br></div>