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

Simplify the interface to Module::lookupConformance.

Browse Source 
Rather than returning a weird PointerIntPair, return an
Optional<ProtocolConformanceRef>. NFC
This commit is contained in:
Doug Gregor
2016-03-15 22:07:14 -07:00
parent b051c5a70f
commit a31edf53d0
15 changed files with 122 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/SILOptimizer/Utils/Local.cpp
View File

@@ -1372,10 +1372,9 @@ optimizeBridgedObjCToSwiftCast(SILInstruction *Inst,
M.getASTContext().getProtocol(KnownProtocolKind::ObjectiveCBridgeable);
auto Conf =
M.getSwiftModule()->lookupConformance(Target, BridgedProto, nullptr);
assert(Conf.getInt() == ConformanceKind::Conforms &&
"_ObjectiveCBridgeable conformance should exist");
assert(Conf && "_ObjectiveCBridgeable conformance should exist");
auto *Conformance = Conf.getPointer();
auto *Conformance = Conf->getConcrete();
auto ParamTypes = BridgedFunc->getLoweredFunctionType()->getParameters();
@@ -1529,8 +1528,7 @@ optimizeBridgedSwiftToObjCCast(SILInstruction *Inst,
auto Conf =
M.getSwiftModule()->lookupConformance(Source, BridgedProto, nullptr);
assert(Conf.getInt() == ConformanceKind::Conforms &&
"_ObjectiveCBridgeable conformance should exist");
assert(Conf && "_ObjectiveCBridgeable conformance should exist");
(void) Conf;
bool isCurrentModuleBridgeToObjectiveC = false;