<div dir="ltr">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?<div><br></div><div>Thanks,</div><div>Teresa<br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, May 11, 2017 at 4:16 PM, Teresa Johnson <span dir="ltr"><<a href="mailto:tejohnson@google.com" target="_blank">tejohnson@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">Hi Tom,<div><br></div><div>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?</div><div><br></div><div>Thanks,</div><div>Teresa</div><div class="gmail_extra"><div><div class="h5"><br><div class="gmail_quote">On Thu, Apr 13, 2017 at 2:51 PM, Teresa Johnson via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: tejohnson<br>
Date: Thu Apr 13 16:51:49 2017<br>
New Revision: 300267<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=300267&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=300267&view=rev</a><br>
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>
Differential Revision: <a href="https://reviews.llvm.org/D32032" rel="noreferrer" target="_blank">https://reviews.llvm.org/D3203<wbr>2</a><br>
<br>
Modified:<br>
    llvm/trunk/lib/Support/Host.cp<wbr>p<br>
<br>
Modified: llvm/trunk/lib/Support/Host.cp<wbr>p<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-pr<wbr>oject/llvm/trunk/lib/Support/H<wbr>ost.cpp?rev=300267&r1=300266&r<wbr>2=300267&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Support/Host.cp<wbr>p (original)<br>
+++ llvm/trunk/lib/Support/Host.cp<wbr>p 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(st<wbr>rs, "\n", /*MaxSplit=*/-1,<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.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><br>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br><div class="m_7453463554682334336m_4347708294803809082gmail-m_-5900767639375794111gmail_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:2px solid rgb(213,15,37)">Teresa Johnson |</td><td nowrap style="border-top:2px solid rgb(51,105,232)"> Software Engineer |</td><td nowrap style="border-top:2px solid rgb(0,153,57)"> <a href="mailto:tejohnson@google.com" target="_blank">tejohnson@google.com</a> |</td><td nowrap style="border-top:2px solid rgb(238,178,17)"> <a href="tel:(408)%20460-2413" value="+14084602413" target="_blank">408-460-2413</a></td></tr></tbody></table></span></div>
</font></span></div></div>
</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></div></div>