From 449c3ef93afc7a668eb35e67a83717453e28b25a Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 13 Jun 2017 01:46:44 +0000
Subject: [PATCH] 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
---
llvm/lib/Support/Host.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp
index d1b40412a6fc..af19dc4ab116 100644
--- a/llvm/lib/Support/Host.cpp
+++ b/llvm/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<StringRef, 8> strs;
(*Text)->getBuffer().split(strs, "\n", /*MaxSplit=*/-1,
--
GitLab