<p dir="ltr">I should be able to merge these today.</p>
<div class="gmail_quote">On May 6, 2015 9:21 AM, "Tom Stellard" <<a href="mailto:tom@stellard.net">tom@stellard.net</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Eric,<br>
<br>
Would you be able to merge these to the 3.6 branch for libcxxabi repo?<br>
I've never done anything with libcxx abi, so it might take me a while<br>
to get things up and merge the patches.<br>
<br>
Thanks,<br>
Tom<br>
<br>
On Wed, May 06, 2015 at 07:12:40AM -0500, Marshall Clow wrote:<br>
> On Sat, May 2, 2015 at 6:05 PM, Eric Fiselier <<a href="mailto:eric@efcs.ca">eric@efcs.ca</a>> wrote:<br>
><br>
> > Hi Tom,<br>
> > CC Marshall<br>
> ><br>
> > I nominate the following patches to be included in 3.6.1.<br>
> ><br>
> > These two commits clean up undefined behavior in readEncodedPointer.<br>
> ><br>
> > - r231839: Fix PR21580 - Undefined behavior in readEncodedPointer()<br>
> >   <a href="https://llvm.org/bugs/show_bug.cgi?id=21580" target="_blank">https://llvm.org/bugs/show_bug.cgi?id=21580</a><br>
> ><br>
> > <a href="https://github.com/llvm-mirror/libcxxabi/commit/89ea9ad0b0a48a9b9fccf6de81bdca1861960855" target="_blank">https://github.com/llvm-mirror/libcxxabi/commit/89ea9ad0b0a48a9b9fccf6de81bdca1861960855</a><br>
> ><br>
> > - r231852: Remove unneeded const_cast in readPointerHelper. Pointed<br>
> > out by jroelofs<br>
> ><br>
> > <a href="https://github.com/llvm-mirror/libcxxabi/commit/fdd39fd838828bba84c4f7ad620207ae0d734ad5" target="_blank">https://github.com/llvm-mirror/libcxxabi/commit/fdd39fd838828bba84c4f7ad620207ae0d734ad5</a><br>
> ><br>
> ><br>
> > These commits how libc++abi matches exception types to catch blocks.<br>
> > In particular it makes libc++abi properly check for multilevel pointer<br>
> > conversions as well as void* conversions.<br>
> ><br>
> ><br>
> > - r233984: Fix multi-level pointer conversions and pointer to member<br>
> > conversion detection.<br>
> ><br>
> > <a href="https://github.com/llvm-mirror/libcxxabi/commit/0cb62d1b51f3d9ab65e0ba7b6541dda0663fe50d" target="_blank">https://github.com/llvm-mirror/libcxxabi/commit/0cb62d1b51f3d9ab65e0ba7b6541dda0663fe50d</a><br>
> ><br>
> > - r234254: Disallow Base to Derived conversions for catching pointers<br>
> > to members.<br>
> ><br>
> > <a href="https://github.com/llvm-mirror/libcxxabi/commit/554d59ab0b989830273c9183f7bdfd12108cad7a" target="_blank">https://github.com/llvm-mirror/libcxxabi/commit/554d59ab0b989830273c9183f7bdfd12108cad7a</a><br>
> ><br>
> > - r236299: Disallow conversions from function pointers to void*.<br>
> ><br>
> > <a href="https://github.com/llvm-mirror/libcxxabi/commit/b979db159a515fe12b54f793690618313e017259" target="_blank">https://github.com/llvm-mirror/libcxxabi/commit/b979db159a515fe12b54f793690618313e017259</a><br>
> ><br>
><br>
> I'm fine with these going into 3.6.1; the last three fix obscure bugs in<br>
> our exception handling code.<br>
><br>
> -- Marshall<br>
</blockquote></div>