averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix <rdar://problem/16151899> init method shouldn't directly access superclasses ivars

Browse Source 
Swift SVN r14336
This commit is contained in:
Chris Lattner
2014-02-25 07:08:54 +00:00
parent 74d2f7a420
commit b2b15d2d88
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AST/Decl.cpp
View File

@@ -470,14 +470,24 @@ SourceRange IfConfigDecl::getSourceRange() const {
/// Return true if a DeclRefExpr or MemberRefExpr use of this value is
/// "direct" when being used in the specified context.
bool ValueDecl::isUseFromContextDirect(const DeclContext *UseDC) const {
// Observing member are accessed directly from within their didSet/willSet
// specifiers. This prevents assignments from becoming infinite loops.
if (auto *var = dyn_cast<AbstractStorageDecl>(this))
if (auto *var = dyn_cast<AbstractStorageDecl>(this)) {
// Observing member are accessed directly from within their didSet/willSet
// specifiers. This prevents assignments from becoming infinite loops.
if (auto *UseFD = dyn_cast<FuncDecl>(UseDC))
if (var->hasStorage() && var->hasAccessorFunctions() &&
UseFD->getAccessorStorageDecl() == var)
return true;
// "StoredWithTrivialAccessors" are generally always accessed directly
// (except by the trivial accessors themselves which are specially handled),
// however, @objc properties always go through their accessors since they
// can be overridden.
if (var->getStorageKind() == VarDecl::StoredWithTrivialAccessors &&
// FIXME: This is probably not the right predicate.
!isObjC())
return true;
}
return false;
}