wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that we diagnose invalid qualifiers on friend functions. 

llvm-svn: 116527
This commit is contained in:
Douglas Gregor 2010-10-14 22:03:51 +00:00
parent 25c9d1170b
commit c3bbf48f47
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/Sema/SemaType.cpp
View File

@ -1403,13 +1403,16 @@ TypeSourceInfo *Sema::GetTypeForDeclarator(Declarator &D, Scope *S,
const FunctionProtoType *FnTy = T->getAs<FunctionProtoType>();
assert(FnTy && "Why oh why is there not a FunctionProtoType here?");
// C++ 8.3.5p4: A cv-qualifier-seq shall only be part of the function type
// for a nonstatic member function, the function type to which a pointer
// to member refers, or the top-level function type of a function typedef
// declaration.
bool FreeFunction = (D.getContext() != Declarator::MemberContext &&
// C++ 8.3.5p4:
// A cv-qualifier-seq shall only be part of the function type
// for a nonstatic member function, the function type to which a pointer
// to member refers, or the top-level function type of a function typedef
// declaration.
bool FreeFunction =
(D.getContext() != Declarator::MemberContext ||
D.getDeclSpec().isFriendSpecified()) &&
(!D.getCXXScopeSpec().isSet() ||
!computeDeclContext(D.getCXXScopeSpec(), /*FIXME:*/true)->isRecord()));
!computeDeclContext(D.getCXXScopeSpec(), /*FIXME:*/true)->isRecord());
if (FnTy->getTypeQuals() != 0 &&
D.getDeclSpec().getStorageClassSpec() != DeclSpec::SCS_typedef &&
(FreeFunction ||

3
clang/test/CXX/class/class.friend/p1.cpp
View File

@ -57,7 +57,8 @@ class A {
friend A operator|(const A& l, const A& r); // okay
friend A operator|(const A& r); // expected-error {{ overloaded 'operator|' must be a binary operator (has 1 parameter) }}
friend operator bool() const; // expected-error {{ must use a qualified name when declaring a conversion operator as a friend }}
friend operator bool() const; // expected-error {{ must use a qualified name when declaring a conversion operator as a friend }} \
// expected-error{{type qualifier is not allowed on this function}}
typedef void ftypedef();
friend ftypedef typedeffed_function; // okay (because it's not declared as a member)

14
clang/test/CXX/dcl.decl/dcl.meaning/dcl.fct/p6.cpp Normal file
View File

@ -0,0 +1,14 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
void f() const; // expected-error{{type qualifier is not allowed on this function}}
struct X {
void f() const;
friend void g() const; // expected-error{{type qualifier is not allowed on this function}}
static void h() const; // expected-error{{type qualifier is not allowed on this function}}
};
struct Y {
friend void X::f() const;
friend void ::f() const; // expected-error{{type qualifier is not allowed on this function}}
};