diff options
| author | Alex Lorenz <arphaman@gmail.com> | 2019-09-11 21:00:13 +0000 |
|---|---|---|
| committer | Alex Lorenz <arphaman@gmail.com> | 2019-09-11 21:00:13 +0000 |
| commit | 428d92832c5d3427756046bb9d3786c51cb1bc6b (patch) | |
| tree | 29a88ece7cd513253b8927aa4c6a7fb6fdfad824 /clang/lib/Tooling/DependencyScanning | |
| parent | a685f5161db97695e1a2bdda39cbdcb3f228f1d6 (diff) | |
| download | bcm5719-llvm-428d92832c5d3427756046bb9d3786c51cb1bc6b.tar.gz bcm5719-llvm-428d92832c5d3427756046bb9d3786c51cb1bc6b.zip | |
[clang-scan-deps] cast Result to ErrorOr<unique_ptr<vfs::File>> explicitly to avoid s390x-linux buildbot failure
llvm-svn: 371664
Diffstat (limited to 'clang/lib/Tooling/DependencyScanning')
| -rw-r--r-- | clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp index 12e8df6360c..7a3d189adac 100644 --- a/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp +++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp @@ -203,7 +203,8 @@ createFile(const CachedFileSystemEntry *Entry, 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 |
