summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseDecl.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-06-12 01:51:59 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-06-12 01:51:59 +0000
commit700537cddf0985bf3f9e93596c8c9dcfdc025518 (patch)
treebf881db020d58387f43883329bc876be2b4a0755 /clang/lib/Parse/ParseDecl.cpp
parentc69a5be0cce4a5b443d22c88eac307105cfebe19 (diff)
downloadbcm5719-llvm-700537cddf0985bf3f9e93596c8c9dcfdc025518.tar.gz
bcm5719-llvm-700537cddf0985bf3f9e93596c8c9dcfdc025518.zip
If parsing a trailing-return-type fails, don't pretend we didn't have one at
all. Suppresses follow-on errors mentioned in PR13074. llvm-svn: 158348
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
-rw-r--r--clang/lib/Parse/ParseDecl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index ac6378035cf..3eeef7bff34 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -4276,7 +4276,7 @@ void Parser::ParseFunctionDeclarator(Declarator &D,
SmallVector<SourceRange, 2> DynamicExceptionRanges;
ExprResult NoexceptExpr;
ParsedAttributes FnAttrs(AttrFactory);
- ParsedType TrailingReturnType;
+ TypeResult TrailingReturnType;
Actions.ActOnStartFunctionDeclarator();
@@ -4358,7 +4358,7 @@ void Parser::ParseFunctionDeclarator(Declarator &D,
if (getLangOpts().CPlusPlus0x && Tok.is(tok::arrow)) {
Diag(Tok, diag::warn_cxx98_compat_trailing_return_type);
SourceRange Range;
- TrailingReturnType = ParseTrailingReturnType(Range).get();
+ TrailingReturnType = ParseTrailingReturnType(Range);
if (Range.getEnd().isValid())
EndLoc = Range.getEnd();
}
OpenPOWER on IntegriCloud