Skip to content

Runtime: Handle universal bridging of class metatypes. #4020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2016
Merged

Runtime: Handle universal bridging of class metatypes. #4020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6ea4fe
Runtime: Handle universal bridging of class metatypes.
jckarter Aug 4, 2016
c3fed97
Runtime: Handle Protocol objects through universal bridging too.
jckarter Aug 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion stdlib/public/runtime/Casting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2756,7 +2756,28 @@ static id bridgeAnythingNonVerbatimToObjectiveC(OpaqueValue *src,
return result;
}

if (auto srcBridgeWitness = findBridgeWitness(srcType)) {
// Handle metatypes.
if (isa<ExistentialMetatypeMetadata>(srcType)
|| isa<MetatypeMetadata>(srcType)) {
const Metadata *srcMetatypeValue;
memcpy(&srcMetatypeValue, src, sizeof(srcMetatypeValue));

// Class metatypes bridge to their class object.
if (isa<ClassMetadata>(srcMetatypeValue)
|| isa<ObjCClassWrapperMetadata>(srcMetatypeValue)) {
return (id)srcMetatypeValue->getClassObject();

// ObjC protocols bridge to their Protocol object.
} else if (auto existential
= dyn_cast<ExistentialTypeMetadata>(srcMetatypeValue)) {
if (existential->isObjC() && existential->Protocols.NumProtocols == 1) {
// Though they're statically-allocated globals, Protocol inherits
// NSObject's default refcounting behavior so must be retained.
auto protocolObj = (id)existential->Protocols[0];
return objc_retain(protocolObj);
}
}
} else if (auto srcBridgeWitness = findBridgeWitness(srcType)) {
// Bridge the source value to an object.
auto srcBridgedObject =
srcBridgeWitness->bridgeToObjectiveC(src, srcType, srcBridgeWitness);
Expand Down
55 changes: 49 additions & 6 deletions test/1_stdlib/BridgeIdAsAny.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,17 @@ func metatypeCanBeDynamicallyCast(original: Int.Type,
expectTrue(original == bridged as! Int.Type)
expectTrue(original == bridged as! Any.Type)
}
func metatypeCanBeDynamicallyCast(original: CFString.Type,
bridged: AnyObject) {
expectTrue(original == bridged as! CFString.Type)
expectTrue(original == bridged as! Any.Type)
}
func metatypeCanBeDynamicallyCastGenerically<T>(original: T.Type,
bridged: AnyObject) {
expectTrue(original == bridged as! T.Type)
expectTrue(original == bridged as! Any.Type)
}


func guineaPigFunction() -> Int {
return 1738
Expand All @@ -114,17 +125,49 @@ func functionCanBeDynamicallyCast(original: () -> Int,
expectEqual(original(), try! (bridged as! () throws -> Int)())
}

func classMetatypePreservesIdentity<T: AnyObject>(original: T.Type,
bridged: AnyObject) {
expectTrue(original as AnyObject === bridged)
expectTrue(original as AnyObject.Type as AnyObject === bridged)
expectTrue(original as Any.Type as AnyObject === bridged)
}

func classMetatypePreservesIdentityGenerically<T>(original: T.Type,
bridged: AnyObject) {
expectTrue(original as AnyObject === bridged)
expectTrue(original as Any.Type as AnyObject === bridged)
}

func protocolObjectPreservesIdentity(original: NSCopying.Protocol,
bridged: AnyObject) {
let proto: Protocol = original
expectTrue(proto === bridged)
}

protocol P {}

// We want to exhaustively check all paths through the bridging and dynamic
// casting infrastructure, so expand out test cases that wrap the different
// interesting bridging cases in different kinds of existential container.
%{
testCases = [
("classes", "LifetimeTracked(0)", "bridgedObjectPreservesIdentity", True),
("strings", '"vitameatavegamin"', "stringBridgesToEqualNSString", True),
("unbridged type", "KnownUnbridged()", "boxedTypeRoundTripsThroughDynamicCasting", True),
("tuple", '(1, "2")', "tupleCanBeDynamicallyCast", False),
("metatype", 'Int.self', "metatypeCanBeDynamicallyCast", False),
("function", 'guineaPigFunction', "functionCanBeDynamicallyCast", False),
("classes", "LifetimeTracked(0)", "bridgedObjectPreservesIdentity", True),
("strings", '"vitameatavegamin"', "stringBridgesToEqualNSString", True),
("unbridged type", "KnownUnbridged()", "boxedTypeRoundTripsThroughDynamicCasting", True),
("tuple", '(1, "2")', "tupleCanBeDynamicallyCast", False),
("metatype", 'Int.self', "metatypeCanBeDynamicallyCast", False),
("generic metatype", 'Int.self', "metatypeCanBeDynamicallyCastGenerically", False),
("CF metatype", 'CFString.self', "metatypeCanBeDynamicallyCast", False),
("generic CF metatype", 'CFString.self', "metatypeCanBeDynamicallyCastGenerically", False),
("class metatype", 'LifetimeTracked.self', "classMetatypePreservesIdentity", False),
("objc metatype", 'NSObject.self', "classMetatypePreservesIdentity", False),
("protocol", 'P.self', "metatypeCanBeDynamicallyCastGenerically", False),
("objc protocol", 'NSCopying.self', "protocolObjectPreservesIdentity", False),
("objc protocol composition", '(NSCopying & NSCoding).self', "metatypeCanBeDynamicallyCastGenerically", False),
("mixed protocol composition", '(NSCopying & P).self', "metatypeCanBeDynamicallyCastGenerically", False),
("generic class metatype", 'LifetimeTracked.self', "classMetatypePreservesIdentityGenerically", False),
("generic objc metatype", 'NSObject.self', "classMetatypePreservesIdentityGenerically", False),
("function", 'guineaPigFunction', "functionCanBeDynamicallyCast", False),
]
}%

Expand Down