]> granicus.if.org Git - llvm/commit
Merging r300267: release_40 origin/release_40
authorTom Stellard <tstellar@redhat.com>
Tue, 13 Jun 2017 01:46:44 +0000 (01:46 +0000)
committerTom Stellard <tstellar@redhat.com>
Tue, 13 Jun 2017 01:46:44 +0000 (01:46 +0000)
commitc8fccc53ed66d505898f8850bcc690c977a7c9a7
tree69e6ddc08eba354826014b2991bc65c9efb2430f
parentbf9338a0679df128255df0dbf963e92b5cef238f
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