Revert "Merge to upstream r304942."

This reverts commit 83b1388ecd, reversing
changes made to f20819f925.

Test: treehugger
Bug: None
This commit is contained in:
Dan Albert
2018-01-11 10:41:39 -08:00
parent ef7d5b4347
commit 38a0d5af7e
1110 changed files with 15077 additions and 19371 deletions

View File

@@ -8,10 +8,6 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: libcpp-no-exceptions
// This test fails due to a stack overflow
// XFAIL: LIBCXX-WINDOWS-FIXME
// <exception>
// class nested_exception;
@@ -47,7 +43,7 @@ class C
{
public:
virtual ~C() {}
C * operator&() const { assert(false); return nullptr; } // should not be called
C * operator&() const { assert(false); } // should not be called
};
class D : private std::nested_exception {};

View File

@@ -107,16 +107,6 @@ int main()
assert(i == 7);
}
}
{
try
{
std::throw_with_nested("String literal");
assert(false);
}
catch (const char *)
{
}
}
#if TEST_STD_VER > 11
{
try