<br><br><div class="gmail_quote">On Fri, Aug 31, 2012 at 9:06 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="HOEnZb"><div class="h5">On Fri, Aug 31, 2012 at 4:43 AM, Alexey Samsonov <<a href="mailto:samsonov@google.com">samsonov@google.com</a>> wrote:<br>
> Author: samsonov<br>
> Date: Fri Aug 31 06:43:01 2012<br>
> New Revision: 162990<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=162990&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=162990&view=rev</a><br>
> Log:<br>
> [Sanitizer] fix overloaded operator error<br>
><br>
> Modified:<br>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer.cc<br>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc<br>
><br>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer.cc?rev=162990&r1=162989&r2=162990&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer.cc?rev=162990&r1=162989&r2=162990&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer.cc (original)<br>
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer.cc Fri Aug 31 06:43:01 2012<br>
> @@ -255,7 +255,7 @@<br>
> }<br>
><br>
> static const uptr kMaxNumberOfModuleContexts = 4096;<br>
> - LoadedModule *modules_; // Array of module descriptions is leaked.<br>
> + LoadedModule *modules_; // Array of module descriptions is leaked.<br>
> uptr n_modules_;<br>
><br>
> ExternalSymbolizer *external_symbolizer_; // Leaked.<br>
><br>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc?rev=162990&r1=162989&r2=162990&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc?rev=162990&r1=162989&r2=162990&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc (original)<br>
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc Fri Aug 31 06:43:01 2012<br>
> @@ -122,7 +122,7 @@<br>
> if (data->current_n == data->max_n)<br>
> return 0;<br>
> InternalScopedBuffer<char> module_name(kMaxPathLength);<br>
> - module_name[0] = '\0';<br>
> + module_name.data()[0] = '\0';<br>
<br>
</div></div>What's the purpose of this change?<br>
<br>
>From what I can see, these two constructs look equivalent, given that<br>
the op[] and data() members are defined as:<br>
<br>
T &operator[](uptr i) { return ptr_[i]; }<br>
T *data() { return ptr_; }<br></blockquote><div><br></div><div><pre><span class="stdout" style="font-family:'Courier New',courier,monotype">../sanitizer_common/sanitizer_symbolizer_linux.cc:125:14: error: use of overloaded operator '[]' is ambiguous (with operand types 'InternalScopedBuffer<char>' and 'int')
module_name[0] = '\0';
~~~~~~~~~~~^~
../sanitizer_common/sanitizer_common.h:71:6: note: candidate function
T &operator[](uptr i) { return ptr_[i]; }
^
../sanitizer_common/sanitizer_symbolizer_linux.cc:125:14: note: built-in candidate operator[](char *, int)
module_name[0] = '\0';</span></pre></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="HOEnZb"><div class="h5"><br>
> if (data->current_n == 0) {<br>
> // First module is the binary itself.<br>
> uptr module_name_len = readlink("/proc/self/exe",<br>
> @@ -133,7 +133,7 @@<br>
> } else if (info->dlpi_name) {<br>
> internal_strncpy(module_name, info->dlpi_name, module_name.size());<br>
> }<br>
> - if (module_name[0] == '\0')<br>
> + if (module_name.data()[0] == '\0')<br>
> return 0;<br>
> void *mem = &data->modules[data->current_n];<br>
> LoadedModule *cur_module = new(mem) LoadedModule(module_name,<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>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov, MSK</div><br>