Commit 449c3ef9 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r300267: 

------------------------------------------------------------------------
r300267 | tejohnson | 2017-04-13 17:51:49 -0400 (Thu, 13 Apr 2017) | 11 lines

[Support] Fix ErrorOr assertion when /proc/cpuinfo doesn't exist.

The ErrorOr should not be dereferenced on the error path.

Patch by Jacob Young

Reviewers: tejohnson

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D32032
------------------------------------------------------------------------

llvm-svn: 305264
parent fcf5f77b

llvm/lib/Support/Host.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,7 @@ static int computeHostNumPhysicalCores() { 
  if (std::error_code EC = Text.getError()) {

    llvm::errs() << "Can't read "

                 << "/proc/cpuinfo: " << EC.message() << "\n";

    return -1;

  }

  SmallVector<StringRef, 8> strs;

  (*Text)->getBuffer().split(strs, "\n", /*MaxSplit=*/-1,