diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2012-04-18 03:24:38 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2012-04-18 03:24:38 +0000 |
| commit | 2d01f2c414b8ef2ae23620ce6c9d3763c8bf73bf (patch) | |
| tree | 2483ee48b3420e3945a0d89c02d9f517f7b5afe0 | |
| parent | 3acf764931e0f3e3ce75db0f4c4d400ee588d6b0 (diff) | |
As per John McCall comment:
Follow up to r154924: check that we are in a static CMethodDecl to enable the Microsoft bug emulation regarding access to protected member during PTM creation. Not just any static function.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154982 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index 024838d4d4..01c141e57f 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -781,10 +781,10 @@ static AccessResult HasAccess(Sema &S, // Emulate a MSVC bug where the creation of pointer-to-member // to protected member of base class is allowed but only from - // a static function. - if (S.getLangOpts().MicrosoftMode && !EC.Functions.empty() && - EC.Functions.front()->getStorageClass() == SC_Static) - return AR_accessible; + // a static function member functions. + if (S.getLangOpts().MicrosoftMode && !EC.Functions.empty()) + if (CXXMethodDecl* MD = dyn_cast<CXXMethodDecl>(EC.Functions.front())) + if (MD->isStatic()) return AR_accessible; // Despite the standard's confident wording, there is a case // where you can have an instance member that's neither in a |