diff options
| -rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 8 | ||||
| -rw-r--r-- | clang/test/SemaCXX/typo-correction-crash.cpp | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index fe0cf744964..c7fb5654516 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -10,6 +10,7 @@ // //===----------------------------------------------------------------------===// +#include "clang/Sema/Ownership.h" #include "clang/Sema/SemaInternal.h" #include "clang/AST/ASTContext.h" #include "clang/AST/ASTDiagnostic.h" @@ -3503,7 +3504,12 @@ bool Sema::DeduceFunctionTypeFromReturnExpr(FunctionDecl *FD, StmtResult Sema::ActOnReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp, Scope *CurScope) { - StmtResult R = BuildReturnStmt(ReturnLoc, RetValExp); + // Correct typos, in case the containing function returns 'auto' and + // RetValExp should determine the deduced type. + ExprResult RetVal = CorrectDelayedTyposInExpr(RetValExp); + if (RetVal.isInvalid()) + return StmtError(); + StmtResult R = BuildReturnStmt(ReturnLoc, RetVal.get()); if (R.isInvalid() || ExprEvalContexts.back().Context == ExpressionEvaluationContext::DiscardedStatement) return R; diff --git a/clang/test/SemaCXX/typo-correction-crash.cpp b/clang/test/SemaCXX/typo-correction-crash.cpp index b7b9c73a0cb..fce10800f2b 100644 --- a/clang/test/SemaCXX/typo-correction-crash.cpp +++ b/clang/test/SemaCXX/typo-correction-crash.cpp @@ -4,12 +4,23 @@ auto check1() { return s; // expected-error {{use of undeclared identifier 's'}} } -int test = 11; // expected-note {{'test' declared here}} +int test = 11; // expected-note 2 {{'test' declared here}} auto check2() { return "s"; return tes; // expected-error {{use of undeclared identifier 'tes'; did you mean 'test'?}} + // expected-error@-1 {{deduced as 'int' here but deduced as 'const char *' in earlier}} } +template <class A, class B> struct is_same { static constexpr bool value = false; }; +template <class A> struct is_same<A,A> { static constexpr bool value = true; }; + +auto L1 = [] { return s; }; // expected-error {{use of undeclared identifier 's'}} +using T1 = decltype(L1()); +static_assert(is_same<T1, void>::value, "Return statement should be discarded"); +auto L2 = [] { return tes; }; // expected-error {{use of undeclared identifier 'tes'; did you mean 'test'?}} +using T2 = decltype(L2()); +static_assert(is_same<T2, int>::value, "Return statement was corrected"); + namespace BarNamespace { namespace NestedNamespace { // expected-note {{'BarNamespace::NestedNamespace' declared here}} typedef int type; |
