diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-05-02 01:29:43 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-05-02 01:29:43 +0000 |
commit | 6deb820a1d2f98e8eda7df1da057cecce8655289 (patch) | |
tree | 7f21877288e2262c3da4a67817aab309e979f6ff /lib/Parse/ParseDecl.cpp | |
parent | 168d31781841ef216f50489decaf7ac6907ca7df (diff) |
Disable our non-standard delayed parsing of exception specifications. Delaying
the parsing of such things appears to be a conforming extension, but it breaks
libstdc++4.7's std::pair.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155975 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDecl.cpp')
-rw-r--r-- | lib/Parse/ParseDecl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 082e335aae..7e2db69fd6 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -4277,12 +4277,18 @@ void Parser::ParseFunctionDeclarator(Declarator &D, IsCXX11MemberFunction); // Parse exception-specification[opt]. + // FIXME: Remove the code to perform delayed parsing of exception + // specifications. +#if 0 bool Delayed = (D.getContext() == Declarator::MemberContext && D.getDeclSpec().getStorageClassSpec() != DeclSpec::SCS_typedef && !D.getDeclSpec().isFriendSpecified()); for (unsigned i = 0, e = D.getNumTypeObjects(); Delayed && i != e; ++i) Delayed &= D.getTypeObject(i).Kind == DeclaratorChunk::Paren; +#else + const bool Delayed = false; +#endif ESpecType = tryParseExceptionSpecification(Delayed, ESpecRange, DynamicExceptions, |