Author: rikka
Date: Thu Aug 4 18:30:54 2011
New Revision: 136943
URL: http://llvm.org/viewvc/llvm-project?rev=136943&view=rev
Log:
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.
Modified:
cfe/trunk/lib/Sema/SemaExpr.cpp
cfe/trunk/test/SemaCXX/function-overload-typo-crash.cpp
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=136943&r1=136942&r2=136943&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Aug 4 18:30:54 2011
@@ -1468,8 +1468,7 @@
ND = Best->Function;
break;
default:
- // Don't try to recover; it won't work.
- return true;
+ break;
}
}
R.addDecl(ND);
Modified: cfe/trunk/test/SemaCXX/function-overload-typo-crash.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/function-overload-typo-crash.cpp?rev=136943&r1=136942&r2=136943&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/function-overload-typo-crash.cpp (original)
+++ cfe/trunk/test/SemaCXX/function-overload-typo-crash.cpp Thu Aug 4 18:30:54
2011
@@ -10,3 +10,22 @@
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'?}}
+}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
