diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-05-12 00:19:22 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-05-12 00:19:22 +0000 |
| commit | b524fdf0333c370917528bbc0a215d1bf2be984a (patch) | |
| tree | d346eff5ef741f28f80e3a128d3c8639926562ce /lib | |
| parent | 444e8d97a0e6e4d25959ded1fc1f51b56a24a25e (diff) | |
Merging r155975:
------------------------------------------------------------------------
r155975 | rsmith | 2012-05-01 18:29:43 -0700 (Tue, 01 May 2012) | 4 lines
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/branches/release_31@156672 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -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 932ffb440f..d8e8c5f56e 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -4266,10 +4266,16 @@ 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()); +#else + const bool Delayed = false; +#endif ESpecType = tryParseExceptionSpecification(Delayed, ESpecRange, DynamicExceptions, |