This is an archive of the discontinued LLVM Phabricator instance.

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

Authored by jacobly on Apr 13 2017, 10:34 AM.

Reviewers

Commits

Summary

The ErrorOr should not be dereferenced on the error path.

LGTM

This revision is now accepted and ready to land.Apr 13 2017, 11:33 AM

I don't have commit access, could you commit this for me?

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

Support/

1 line

	Show First 20 Lines • Show All 1,239 Lines • ▼ Show 20 Lines
	static int computeHostNumPhysicalCores() {			static int computeHostNumPhysicalCores() {
	// Read /proc/cpuinfo as a stream (until EOF reached). It cannot be			// Read /proc/cpuinfo as a stream (until EOF reached). It cannot be
	// mmapped because it appears to have 0 size.			// mmapped because it appears to have 0 size.
	llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Text =			llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Text =
	llvm::MemoryBuffer::getFileAsStream("/proc/cpuinfo");			llvm::MemoryBuffer::getFileAsStream("/proc/cpuinfo");
	if (std::error_code EC = Text.getError()) {			if (std::error_code EC = Text.getError()) {
	llvm::errs() << "Can't read "			llvm::errs() << "Can't read "
	<< "/proc/cpuinfo: " << EC.message() << "\n";			<< "/proc/cpuinfo: " << EC.message() << "\n";
				return -1;
	}			}
	SmallVector<StringRef, 8> strs;			SmallVector<StringRef, 8> strs;
	(Text)->getBuffer().split(strs, "\n", /MaxSplit=*/-1,			(Text)->getBuffer().split(strs, "\n", /MaxSplit=*/-1,
	/KeepEmpty=/false);			/KeepEmpty=/false);
	int CurPhysicalId = -1;			int CurPhysicalId = -1;
	int CurCoreId = -1;			int CurCoreId = -1;
	SmallSet<std::pair<int, int>, 32> UniqueItems;			SmallSet<std::pair<int, int>, 32> UniqueItems;
	for (auto &Line : strs) {			for (auto &Line : strs) {
	▲ Show 20 Lines • Show All 239 Lines • Show Last 20 Lines