mirror of
https://github.com/RPCS3/llvm.git
synced 2025-05-13 17:06:15 +00:00
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
This commit is contained in:
parent
bf9338a067
commit
c8fccc53ed
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user