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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2019-06-10 12:49:35 -07:00
parent bd289bd38f 15ecf924f0
commit 12ebbba1ed
3 changed files with 113 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/IRGen/GenKeyPath.cpp
View File

@@ -747,31 +747,50 @@ emitKeyPathComponent(IRGenModule &IGM,
fields.addInt32(fieldOffset.getValue());
break;
}
auto *classDecl = baseTy->getClassOrBoundGenericClass();
auto loweredClassTy = loweredBaseTy;
// Recover class decl from superclass constraint
if (!classDecl && genericEnv) {
auto ty = genericEnv->mapTypeIntoContext(baseTy)->getCanonicalType();
auto archetype = dyn_cast<ArchetypeType>(ty);
if (archetype && archetype->requiresClass()) {
auto superClassTy = ty->getSuperclass(false)->getCanonicalType();
classDecl = superClassTy->getClassOrBoundGenericClass();
loweredClassTy =
IGM.getLoweredType(AbstractionPattern::getOpaque(),
superClassTy->getWithoutSpecifierType());
}
}
// For a class, we may know the fixed offset of a field at compile time,
// or we may need to fetch it at instantiation time. Depending on the
// ObjC-ness and resilience of the class hierarchy, there might be a few
// different ways we need to go about this.
if (loweredBaseTy.getClassOrBoundGenericClass()) {
if (loweredClassTy.getClassOrBoundGenericClass()) {
// Use the property's class type to determine the field access.
auto propertyBaseDecl = property->getDeclContext()->getSelfClassDecl();
auto currentBaseTy =
loweredBaseTy.getASTType()->getSuperclassForDecl(propertyBaseDecl);
loweredClassTy.getASTType()->getSuperclassForDecl(propertyBaseDecl);
assert(currentBaseTy->getClassOrBoundGenericClass() == propertyBaseDecl);
loweredBaseTy =
loweredClassTy =
IGM.getLoweredType(AbstractionPattern::getOpaque(), currentBaseTy);
auto loweredBaseContextTy = SILType::getPrimitiveObjectType(
auto loweredBaseContextTy =
SILType::getPrimitiveObjectType(loweredClassTy.getASTType());
if (!loweredClassTy.getASTType()->hasArchetype())
loweredBaseContextTy = SILType::getPrimitiveObjectType(
GenericEnvironment::mapTypeIntoContext(genericEnv,
loweredBaseTy.getASTType())
->getCanonicalType());
loweredClassTy.getASTType())
->getCanonicalType());
switch (getClassFieldAccess(IGM, loweredBaseContextTy, property)) {
case FieldAccess::ConstantDirect: {
// Known constant fixed offset.
auto offset = tryEmitConstantClassFragilePhysicalMemberOffset(IGM,
loweredBaseTy,
loweredClassTy,
property);
assert(offset && "no constant offset for ConstantDirect field?!");
addFixedOffset(/*struct*/ false, property->isLet(), offset);
@@ -794,10 +813,8 @@ emitKeyPathComponent(IRGenModule &IGM,
auto header = KeyPathComponentHeader
::forClassComponentWithUnresolvedFieldOffset(property->isLet());
fields.addInt32(header.getData());
auto fieldOffset =
getClassFieldOffsetOffset(IGM,
loweredBaseTy.getClassOrBoundGenericClass(),
property);
auto fieldOffset = getClassFieldOffsetOffset(
IGM, loweredClassTy.getClassOrBoundGenericClass(), property);
fields.addInt32(fieldOffset.getValue());
break;
}
@@ -960,6 +977,20 @@ emitKeyPathComponent(IRGenModule &IGM,
// the property.
auto property = id.getProperty();
idKind = KeyPathComponentHeader::StoredPropertyIndex;
auto *classDecl = baseTy->getClassOrBoundGenericClass();
auto loweredClassTy = loweredBaseTy;
// Recover class decl from superclass constraint
if (!classDecl && genericEnv) {
auto ty = genericEnv->mapTypeIntoContext(baseTy)->getCanonicalType();
auto archetype = dyn_cast<ArchetypeType>(ty);
if (archetype && archetype->requiresClass()) {
auto superClassTy = ty->getSuperclass(false)->getCanonicalType();
classDecl = superClassTy->getClassOrBoundGenericClass();
loweredClassTy =
IGM.getLoweredType(AbstractionPattern::getOpaque(),
superClassTy->getWithoutSpecifierType());
}
}
if (auto struc = baseTy->getStructOrBoundGenericStruct()) {
// Scan the stored properties of the struct to find the index. We should
// only ever use a struct field as a uniquing key from inside the
@@ -976,12 +1007,12 @@ emitKeyPathComponent(IRGenModule &IGM,
}
assert(structIdx && "not a stored property of the struct?!");
idValue = llvm::ConstantInt::get(IGM.SizeTy, structIdx.getValue());
} else if (auto *classDecl = baseTy->getClassOrBoundGenericClass()) {
} else if (classDecl) {
// TODO: This field index would require runtime resolution with Swift
// native class resilience. We never directly access ObjC-imported
// ivars so we can disregard ObjC ivar resilience for this computation
// and start counting at the Swift native root.
switch (getClassFieldAccess(IGM, loweredBaseTy, property)) {
switch (getClassFieldAccess(IGM, loweredClassTy, property)) {
case FieldAccess::ConstantDirect:
case FieldAccess::ConstantIndirect:
case FieldAccess::NonConstantDirect: