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

SIL: Capture generic parameters through nested closures.

Browse Source 
We were failing to capture generic parameters from closure contexts that themselves capture generic parameters from context. This fixes <rdar://problem/15417783>. While we're here, eliminate some unnecessary splitting of 'ClosureExpr' and 'AutoClosureExpr' in the SILDeclRef::Loc PointerUnion; we can just use their base class AbstractClosureExpr in the PointerUnion.

Swift SVN r10031
This commit is contained in:
Joe Groff
2013-11-07 23:39:37 +00:00
parent 2ba1d6cec9
commit 9c0e07fe35
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/swift/SIL/SILDeclRef.h
View File

@@ -30,6 +30,7 @@ namespace llvm {
namespace swift {
class ValueDecl;
class AbstractClosureExpr;
class ClosureExpr;
class AutoClosureExpr;
class ASTContext;
@@ -48,8 +49,7 @@ namespace swift {
/// initializing entry points of a constructor, the getter and setter for
/// a computed variable, etc.
struct SILDeclRef {
typedef llvm::PointerUnion3<ValueDecl *, ClosureExpr *,
AutoClosureExpr *> Loc;
typedef llvm::PointerUnion<ValueDecl *, AbstractClosureExpr *> Loc;
/// Represents the "kind" of the SILDeclRef. For some Swift decls there
/// are multiple SIL entry points, and the kind is used to distinguish them.
@@ -142,18 +142,23 @@ struct SILDeclRef {
bool hasDecl() const { return loc.is<ValueDecl *>(); }
bool hasClosureExpr() const {
return loc.is<ClosureExpr *>();
return loc.is<AbstractClosureExpr *>()
&& isa<ClosureExpr>(getAbstractClosureExpr() );
}
bool hasAutoClosureExpr() const {
return loc.is<AutoClosureExpr *>();
return loc.is<AbstractClosureExpr *>()
&& isa<AutoClosureExpr>(getAbstractClosureExpr());
}
ValueDecl *getDecl() const { return loc.get<ValueDecl *>(); }
AbstractClosureExpr *getAbstractClosureExpr() const {
return loc.dyn_cast<AbstractClosureExpr *>();
}
ClosureExpr *getClosureExpr() const {
return loc.dyn_cast<ClosureExpr *>();
return dyn_cast<ClosureExpr>(getAbstractClosureExpr());
}
AutoClosureExpr *getAutoClosureExpr() const {
return loc.dyn_cast<AutoClosureExpr *>();
return dyn_cast<AutoClosureExpr>(getAbstractClosureExpr());
}
/// True if the SILDeclRef references a function.