diff options
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 20 | ||||
| -rw-r--r-- | lib/Sema/SemaInherit.h | 2 | ||||
| -rw-r--r-- | test/SemaCXX/access-base-class.cpp | 32 |
3 files changed, 49 insertions, 5 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index cc212434b7..e65b050500 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -55,7 +55,7 @@ bool Sema::CheckBaseClassAccess(QualType Derived, QualType Base, const CXXBaseSpecifier *InacessibleBase = 0; - const CXXRecordDecl* CurrentClassDecl = 0; + CXXRecordDecl* CurrentClassDecl = 0; if (CXXMethodDecl *MD = dyn_cast_or_null<CXXMethodDecl>(getCurFunctionDecl())) CurrentClassDecl = MD->getParent(); @@ -79,9 +79,21 @@ bool Sema::CheckBaseClassAccess(QualType Derived, QualType Base, if (CurrentClassDecl != Element->Class) FoundInaccessibleBase = true; break; - case AS_protected: - // FIXME: Implement - break; + case AS_protected: + // FIXME: Check if the current function/class is a friend. + if (!CurrentClassDecl) { + FoundInaccessibleBase = true; + break; + } + + if (CurrentClassDecl != Element->Class) { + QualType CurrentClassType = Context.getTypeDeclType(CurrentClassDecl); + QualType ClassType = Context.getTypeDeclType(Element->Class); + + if (!IsDerivedFrom(CurrentClassType, ClassType)) + FoundInaccessibleBase = true; + break; + } } if (FoundInaccessibleBase) { diff --git a/lib/Sema/SemaInherit.h b/lib/Sema/SemaInherit.h index 6138685b26..a164d43e8a 100644 --- a/lib/Sema/SemaInherit.h +++ b/lib/Sema/SemaInherit.h @@ -40,7 +40,7 @@ namespace clang { const CXXBaseSpecifier *Base; /// Class - The record decl of the class that the base is a base of. - const CXXRecordDecl *Class; + CXXRecordDecl *Class; /// SubobjectNumber - Identifies which base class subobject (of type /// @c Base->getType()) this base path element refers to. This diff --git a/test/SemaCXX/access-base-class.cpp b/test/SemaCXX/access-base-class.cpp index f98437695e..3e50b26e5a 100644 --- a/test/SemaCXX/access-base-class.cpp +++ b/test/SemaCXX/access-base-class.cpp @@ -80,3 +80,35 @@ namespace T6 { A *a = c; } } + +namespace T7 { + +class C; +class A { }; +class B : protected A { // expected-note {{'protected' inheritance specifier here}} + void f(C *); +}; + +class C : protected B { // expected-note {{'protected' inheritance specifier here}} + void f(C *c) { + A* a = c; + } +}; + +void B::f(C *c) { + A *a = c; // expected-error {{conversion from 'class T7::C' to inaccessible base class 'class T7::A'}} \ + expected-error {{incompatible type initializing 'class T7::C *', expected 'class T7::A *'}} +} + +class D : private C { + void f(D *d) { + A *a = d; + } +}; + +void f(B* b) { + A *a = b; // expected-error {{conversion from 'class T7::B' to inaccessible base class 'class T7::A'}} \ + expected-error {{incompatible type initializing 'class T7::B *', expected 'class T7::A *'}} +} + +} |