maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

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.

llvm-svn: 285970
This commit is contained in:
Lang Hames 2016-11-03 22:01:47 +00:00
parent 962eaaea9c
commit d662db602a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/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