From c8fccc53ed66d505898f8850bcc690c977a7c9a7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 13 Jun 2017 01:46:44 +0000 Subject: 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 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_40@305264 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/Host.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Support/Host.cpp b/lib/Support/Host.cpp index d1b40412a6fc..af19dc4ab116 100644 --- a/lib/Support/Host.cpp +++ b/lib/Support/Host.cpp @@ -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 strs; (*Text)->getBuffer().split(strs, "\n", /*MaxSplit=*/-1, -- cgit v1.2.1