<div dir="ltr">Great, thanks!<div>Teresa</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jun 6, 2017 at 10:03 AM, Tom Stellard <span dir="ltr"><<a href="mailto:tstellar@redhat.com" target="_blank">tstellar@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Teresa,<br>
<br>
Sorry I overlooked this. I will merge this, it looks fairly trivial.<br>
<br>
-Tom<br>
<span class=""><br>
On 06/05/2017 03:26 PM, Teresa Johnson wrote:<br>
> I just realized I never heard back about this - I see rc2 has been tagged already, is it too late to get this merged in?<br>
><br>
> Thanks,<br>
> Teresa<br>
><br>
</span><span class="">> On Thu, May 11, 2017 at 4:16 PM, Teresa Johnson <<a href="mailto:tejohnson@google.com">tejohnson@google.com</a> <mailto:<a href="mailto:tejohnson@google.com">tejohnson@google.com</a>>> wrote:<br>
><br>
> Hi Tom,<br>
><br>
> I'd like to propose that we merge this fix into 4.0.1 (for PR33008). Would it be ok for me to merge it onto the branch?<br>
><br>
> Thanks,<br>
> Teresa<br>
><br>
</span><span class="">> On Thu, Apr 13, 2017 at 2:51 PM, Teresa Johnson via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a> <mailto:<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.<wbr>llvm.org</a>>> wrote:<br>
><br>
> Author: tejohnson<br>
> Date: Thu Apr 13 16:51:49 2017<br>
> New Revision: 300267<br>
><br>
</span>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=300267&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=300267&view=rev</a> <<a href="http://llvm.org/viewvc/llvm-project?rev=300267&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=300267&view=rev</a>><br>
<span class="">> Log:<br>
> [Support] Fix ErrorOr assertion when /proc/cpuinfo doesn't exist.<br>
><br>
> The ErrorOr should not be dereferenced on the error path.<br>
><br>
> Patch by Jacob Young<br>
><br>
> Reviewers: tejohnson<br>
><br>
> Subscribers: llvm-commits<br>
><br>
</span>> Differential Revision: <a href="https://reviews.llvm.org/D32032" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D32032</a> <<a href="https://reviews.llvm.org/D32032" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D32032</a>><br>
><br>
> Modified:<br>
> llvm/trunk/lib/Support/Host.<wbr>cpp<br>
><br>
> Modified: llvm/trunk/lib/Support/Host.<wbr>cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Host.cpp?rev=300267&r1=300266&r2=300267&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>Support/Host.cpp?rev=300267&<wbr>r1=300266&r2=300267&view=diff</a> <<a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Host.cpp?rev=300267&r1=300266&r2=300267&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>Support/Host.cpp?rev=300267&<wbr>r1=300266&r2=300267&view=diff</a>><br>
<span class="">> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/lib/Support/Host.<wbr>cpp (original)<br>
> +++ llvm/trunk/lib/Support/Host.<wbr>cpp Thu Apr 13 16:51:49 2017<br>
> @@ -1245,6 +1245,7 @@ static int computeHostNumPhysicalCores()<br>
> if (std::error_code EC = Text.getError()) {<br>
> llvm::errs() << "Can't read "<br>
> << "/proc/cpuinfo: " << EC.message() << "\n";<br>
> + return -1;<br>
> }<br>
> SmallVector<StringRef, 8> strs;<br>
> (*Text)->getBuffer().split(<wbr>strs, "\n", /*MaxSplit=*/-1,<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
</span>> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a> <mailto:<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.<wbr>llvm.org</a>><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a> <<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-<wbr>bin/mailman/listinfo/llvm-<wbr>commits</a>><br>
><br>
><br>
><br>
><br>
> --<br>
> Teresa Johnson | Software Engineer | <a href="mailto:tejohnson@google.com">tejohnson@google.com</a> <mailto:<a href="mailto:tejohnson@google.com">tejohnson@google.com</a>> | <a href="tel:408-460-2413" value="+14084602413">408-460-2413</a> <tel:%28408%29%20460-2413><br>
><br>
><br>
><br>
<span class="HOEnZb"><font color="#888888">><br>
> --<br>
> Teresa Johnson | Software Engineer | <a href="mailto:tejohnson@google.com">tejohnson@google.com</a> <mailto:<a href="mailto:tejohnson@google.com">tejohnson@google.com</a>> | <a href="tel:408-460-2413" value="+14084602413">408-460-2413</a><br>
><br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><span style="font-family:Times;font-size:medium"><table cellspacing="0" cellpadding="0"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small"><td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Teresa Johnson |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tejohnson@google.com" target="_blank">tejohnson@google.com</a> |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"> 408-460-2413</td></tr></tbody></table></span></div>
</div>