diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 10 | ||||
| -rw-r--r-- | clang/test/CXX/drs/dr0xx.cpp | 5 | ||||
| -rw-r--r-- | clang/test/CXX/expr/expr.unary/expr.unary.op/p4.cpp | 4 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/instantiate-overload-candidates.cpp | 2 | ||||
| -rw-r--r-- | clang/www/cxx_dr_status.html | 4 |
5 files changed, 17 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 66598992d7f..08e30890945 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -8356,7 +8356,15 @@ static QualType CheckAddressOfOperand(Sema &S, ExprResult &OrigOp, << OrigOp.get()->getSourceRange(); return QualType(); } - + + OverloadExpr *Ovl = cast<OverloadExpr>(OrigOp.get()->IgnoreParens()); + if (isa<UnresolvedMemberExpr>(Ovl)) + if (!S.ResolveSingleFunctionTemplateSpecialization(Ovl)) { + S.Diag(OpLoc, diag::err_invalid_form_pointer_member_function) + << OrigOp.get()->getSourceRange(); + return QualType(); + } + return S.Context.OverloadTy; } diff --git a/clang/test/CXX/drs/dr0xx.cpp b/clang/test/CXX/drs/dr0xx.cpp index 5ffc7516f5d..01b1b2aea45 100644 --- a/clang/test/CXX/drs/dr0xx.cpp +++ b/clang/test/CXX/drs/dr0xx.cpp @@ -627,7 +627,7 @@ namespace dr60 { // dr60: yes int &n = f(k); } -namespace dr61 { // dr61: no +namespace dr61 { // dr61: yes struct X { static void f(); } x; @@ -638,8 +638,7 @@ namespace dr61 { // dr61: no // This is (presumably) valid, because x.f does not refer to an overloaded // function name. void (*p)() = &x.f; - // FIXME: This should be rejected. - void (*q)() = &y.f; + void (*q)() = &y.f; // expected-error {{cannot create a non-constant pointer to member function}} } namespace dr62 { // dr62: yes diff --git a/clang/test/CXX/expr/expr.unary/expr.unary.op/p4.cpp b/clang/test/CXX/expr/expr.unary/expr.unary.op/p4.cpp index 06cc6107402..cd55cc2441a 100644 --- a/clang/test/CXX/expr/expr.unary/expr.unary.op/p4.cpp +++ b/clang/test/CXX/expr/expr.unary/expr.unary.op/p4.cpp @@ -38,6 +38,8 @@ namespace test2 { }; void A::test() { - int (A::*ptr)(int) = &(A::foo); // expected-error {{can't form member pointer of type 'int (test2::A::*)(int)' without '&' and class name}} + // FIXME: The error message in this case is less than clear, we can do + // better. + int (A::*ptr)(int) = &(A::foo); // expected-error {{cannot create a non-constant pointer to member function}} } } diff --git a/clang/test/SemaTemplate/instantiate-overload-candidates.cpp b/clang/test/SemaTemplate/instantiate-overload-candidates.cpp index 7542dbd8ab9..6b156a20a4c 100644 --- a/clang/test/SemaTemplate/instantiate-overload-candidates.cpp +++ b/clang/test/SemaTemplate/instantiate-overload-candidates.cpp @@ -26,7 +26,7 @@ template<typename T> struct X { static T f() { T::error; } // expected-error {{has no members}} static T f(bool); }; -void (*p)() = &X<void>().f; // expected-note {{instantiation of}} +void (*p)() = &X<void>::f; // expected-note {{instantiation of}} namespace PR13098 { struct A { diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html index 7ec46ab8b04..4c43d45208f 100644 --- a/clang/www/cxx_dr_status.html +++ b/clang/www/cxx_dr_status.html @@ -80,7 +80,7 @@ <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#7">7</a></td> <td>NAD</td> <td>Can a class with a private virtual base class be derived from?</td> - <td class="none" align="center">No</td> + <td class="full" align="center">Yes</td> </tr> <tr> <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#8">8</a></td> @@ -404,7 +404,7 @@ <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#61">61</a></td> <td>NAD</td> <td>Address of static member function "<TT>&p->f</TT>"</td> - <td class="none" align="center">No</td> + <td class="full" align="center">Yes</td> </tr> <tr> <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#62">62</a></td> |
