diff options
| author | John McCall <rjmccall@apple.com> | 2009-08-25 17:53:59 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2009-08-25 17:53:59 +0000 |
| commit | 91cf4199cca311ea9c3b3a4e2b3984d508c9e5e3 (patch) | |
| tree | ba8138ea91c12a096903691e480bda60f87df4e9 | |
| parent | 05396e20d68535612f58c84e0dfc7647c75a7da1 (diff) | |
Modify an assert to capture the restriction on friend declarations more
accurately. Prevents the assert from triggering incorrectly when friending
functions first declared in extern "C" contexts. Fixes bug 4757.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80016 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 3 | ||||
| -rw-r--r-- | test/CXX/class/class.friend/p1.cpp | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index ee6238c56c..61f0ce808a 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2390,7 +2390,8 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, FunctionDecl *NewFD; if (isFriend) { // DC is the namespace in which the function is being declared. - assert(DC->isFileContext() || D.getCXXScopeSpec().isSet()); + assert((DC->isFileContext() || PrevDecl) && "previously-undeclared " + "friend function being created in a non-namespace context"); // C++ [class.friend]p5 // A function can be defined in a friend declaration of a diff --git a/test/CXX/class/class.friend/p1.cpp b/test/CXX/class/class.friend/p1.cpp index 80afe3e7a5..1b2c4dfcd4 100644 --- a/test/CXX/class/class.friend/p1.cpp +++ b/test/CXX/class/class.friend/p1.cpp @@ -18,6 +18,11 @@ struct Derived : public Base { int myglobal; +void global_function(); +extern "C" { + void global_c_function(); +} + class A { class AInner { }; @@ -29,6 +34,9 @@ class A { friend int myoperation(float); // okay friend int myglobal; // expected-error {{ friends can only be classes or functions }} + friend void global_function(); + friend void global_c_function(); + void a_member(); friend void A::a_member(); // expected-error {{ friends cannot be members of the declaring class }} friend void a_member(); // okay (because we ignore class scopes when looking up friends) |