Author: arphaman
Date: Wed Sep 11 14:00:13 2019
New Revision: 371664
URL: http://llvm.org/viewvc/llvm-project?rev=371664&view=rev
Log:
[clang-scan-deps] cast Result to ErrorOr<unique_ptr<vfs::File>> explicitly to
avoid s390x-linux buildbot failure
Modified:
cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
Modified:
cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp?rev=371664&r1=371663&r2=371664&view=diff
==============================================================================
--- cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
(original)
+++ cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
Wed Sep 11 14:00:13 2019
@@ -203,7 +203,8 @@ createFile(const CachedFileSystemEntry *
if (!Entry->getPPSkippedRangeMapping().empty() && PPSkipMappings)
(*PPSkipMappings)[Result->getBufferPtr()] =
&Entry->getPPSkippedRangeMapping();
- return Result;
+ return llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>>(
+ std::unique_ptr<llvm::vfs::File>(std::move(Result)));
}
} // end anonymous namespace
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
