RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-13 23:18:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Support] Fix a segfault in llvm::Expected.

Browse Source 
This fixes a mismatch between the declared error_type and the type used with
the placement new that initializes the field.

Patch by Yichao Yu.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@285970 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2016-11-03 22:01:47 +00:00
parent 298455f377
commit 4373dd0316
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/Error.h
View File

@ -147,7 +147,7 @@ class LLVM_NODISCARD Error {
// Expected<T> needs to be able to steal the payload when constructed from an
// error.
template <typename T> class Expected;
template <typename T> friend class Expected;
public:
/// Create a success value. Prefer using 'Error::success()' for readability
@ -642,7 +642,7 @@ public:
{
assert(Err && "Cannot create Expected<T> from Error success value.");
new (getErrorStorage()) Error(std::move(Err));
new (getErrorStorage()) error_type(Err.takePayload());
}
/// Create an Expected<T> success value from the given OtherT value, which