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

Require a GenericSignature for dependent AbstractionPatterns.

Browse Source 
We still don't actually handle these correctly, but at least
we have sensible information for them now.

Also, remember that we're working with canonical generic
signatures in more places.

Swift SVN r27388
This commit is contained in:
John McCall
2015-04-16 23:27:00 +00:00
parent 2f555e0a35
commit 9f38d8da50
12 changed files with 143 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/swift/SIL/AbstractionPattern.h
View File

@@ -77,9 +77,11 @@ class AbstractionPattern {
const clang::Type *ClangType;
const clang::ObjCMethodDecl *ObjCMethod;
const AbstractionPattern *OrigTupleElements;
GenericSignature *GenericSig; // always canonical
};
static bool isOpaqueType(CanType type) {
static bool isOpaqueType(CanGenericSignature signature, CanType type) {
assert(signature || !type->isDependentType());
if (auto arch = dyn_cast<ArchetypeType>(type))
return !arch->requiresClass();
// FIXME: Check class constraint of dependent types in their originating
@@ -93,6 +95,11 @@ class AbstractionPattern {
Kind getKind() const { return Kind(TheKind); }
CanGenericSignature getGenericSignature() const {
assert(getKind() == Kind::Type);
return CanGenericSignature(GenericSig);
}
unsigned getNumTupleElements_Stored() const {
assert(getKind() == Kind::Tuple);
return OtherData;
@@ -109,18 +116,20 @@ class AbstractionPattern {
getKind() == Kind::ObjCMethodFormalParamTupleType);
}
void initSwiftType(CanType origType) {
if (isOpaqueType(origType)) {
void initSwiftType(CanGenericSignature signature, CanType origType) {
assert(signature || !origType->isDependentType());
if (isOpaqueType(signature, origType)) {
TheKind = unsigned(Kind::Opaque);
} else {
TheKind = unsigned(Kind::Type);
OrigType = origType;
GenericSig = signature;
}
}
void initClangType(CanType origType, const clang::Type *clangType,
Kind kind = Kind::ClangType) {
assert(!isOpaqueType(origType));
assert(!isOpaqueType(nullptr, origType));
TheKind = unsigned(kind);
OrigType = origType;
ClangType = clangType;
@@ -128,7 +137,7 @@ class AbstractionPattern {
void initObjCMethod(CanType origType, const clang::ObjCMethodDecl *method,
Kind kind) {
assert(!isOpaqueType(origType));
assert(!isOpaqueType(nullptr, origType));
TheKind = unsigned(kind);
OrigType = origType;
ObjCMethod = method;
@@ -140,8 +149,10 @@ class AbstractionPattern {
public:
explicit AbstractionPattern(Type origType)
: AbstractionPattern(origType->getCanonicalType()) {}
explicit AbstractionPattern(CanType origType) {
initSwiftType(origType);
explicit AbstractionPattern(CanType origType)
: AbstractionPattern(nullptr, origType) {}
explicit AbstractionPattern(CanGenericSignature signature, CanType origType) {
initSwiftType(signature, origType);
}
explicit AbstractionPattern(CanType origType, const clang::Type *clangType) {
initClangType(origType, clangType);