replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a problem when calling throw_with_nested with a class marked 'final'. Thanks to STL @ Microsoft for the bug report. 

llvm-svn: 232384
This commit is contained in:
Marshall Clow 2015-03-16 15:10:28 +00:00
parent f424990d37
commit b7361983d1
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcxx/include/exception
View File

@ -193,6 +193,9 @@ void
throw_with_nested(_Tp&& __t, typename enable_if<
is_class<typename remove_reference<_Tp>::type>::value &&
!is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
#if _LIBCPP_STD_VER > 11
&& !is_final<typename remove_reference<_Tp>::type>::value
#endif
>::type* = 0)
#else // _LIBCPP_HAS_NO_RVALUE_REFERENCES
throw_with_nested (_Tp& __t, typename enable_if<
@ -212,6 +215,9 @@ void
throw_with_nested(_Tp&& __t, typename enable_if<
!is_class<typename remove_reference<_Tp>::type>::value ||
is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
#if _LIBCPP_STD_VER > 11
|| is_final<typename remove_reference<_Tp>::type>::value
#endif
>::type* = 0)
#else // _LIBCPP_HAS_NO_RVALUE_REFERENCES
throw_with_nested (_Tp& __t, typename enable_if<

16
libcxx/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
View File

@ -36,6 +36,10 @@ public:
friend bool operator==(const B& x, const B& y) {return x.data_ == y.data_;}
};
#if __cplusplus > 201103L
struct Final final {};
#endif
int main()
{
{
@ -100,4 +104,16 @@ int main()
assert(i == 7);
}
}
#if __cplusplus > 201103L
{
try
{
std::throw_with_nested(Final());
assert(false);
}
catch (const Final &f)
{
}
}
#endif
}