diff options
| author | Kaelyn Uhrain <rikka@google.com> | 2011-08-04 23:30:54 +0000 |
|---|---|---|
| committer | Kaelyn Uhrain <rikka@google.com> | 2011-08-04 23:30:54 +0000 |
| commit | 844d5728557a324fe10ad990dd537e59780873ef (patch) | |
| tree | 17a788cf783784dfe881a0b4d9930cc86cbe0e43 | |
| parent | 42d7b2d25b6f90dc397886d05502b10ab5a8b51b (diff) | |
Fix a small bug where DiagnoseEmptyLookup would no longer print any messages
when performing typo correction involving any overloaded template functions.
The added test cases, while currently demontrating sub-optimal behavior, will
not trigger any messages without the 1-line change to SemaExpr.cpp.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136943 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 3 | ||||
| -rw-r--r-- | test/SemaCXX/function-overload-typo-crash.cpp | 19 |
2 files changed, 20 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 6ace3e92e6..ffa092aad1 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -1468,8 +1468,7 @@ bool Sema::DiagnoseEmptyLookup(Scope *S, CXXScopeSpec &SS, LookupResult &R, ND = Best->Function; break; default: - // Don't try to recover; it won't work. - return true; + break; } } R.addDecl(ND); diff --git a/test/SemaCXX/function-overload-typo-crash.cpp b/test/SemaCXX/function-overload-typo-crash.cpp index 580f27a12a..a0f70dfbdb 100644 --- a/test/SemaCXX/function-overload-typo-crash.cpp +++ b/test/SemaCXX/function-overload-typo-crash.cpp @@ -10,3 +10,22 @@ void f() { fin(); //expected-error {{use of undeclared identifier 'fin'; did you mean 'min'}} fax(0); //expected-error {{use of undeclared identifier 'fax'; did you mean 'max'}} } + +// TODO: Add proper function overloading resolution for template functions +template <typename T> void somefunc(T*, T*); +template <typename T> void somefunc(const T[]); +template <typename T1, typename T2> void somefunc(T1*, T2*); +template <typename T1, typename T2> void somefunc(T1*, const T2[]); //expected-note 5 {{'somefunc' declared here}} \ + //expected-note {{candidate function template not viable: requires 2 arguments, but 1 was provided}} TODO this shouldn't happen + +void c() { + int *i = 0, *j = 0; + const int x[] = {1, 2, 3}; + long *l = 0; + somefun(i, j); //expected-error {{use of undeclared identifier 'somefun'; did you mean 'somefunc'?}} + somefun(x); //expected-error {{use of undeclared identifier 'somefun'; did you mean 'somefunc'?}} \ + //expected-error {{no matching function for call to 'somefunc'}} TODO this shouldn't happen + somefun(i, l); //expected-error {{use of undeclared identifier 'somefun'; did you mean 'somefunc'?}} + somefun(l, x); //expected-error {{use of undeclared identifier 'somefun'; did you mean 'somefunc'?}} + somefun(i, x); //expected-error {{use of undeclared identifier 'somefun'; did you mean 'somefunc'?}} +} |