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

Revert "[SILGen] Implement NSString -> String bridging through _ObjectiveCBridgeable."

Browse Source 
This reverts commit aa9cc23743.
This commit is contained in:
Doug Gregor
2016-03-15 06:52:27 -07:00
parent 51f4e5762d
commit 01fe7e4848
15 changed files with 60 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Sema/CSApply.cpp
View File

@@ -1276,11 +1276,9 @@ namespace {
// Find the conformance of the value type to _BridgedToObjectiveC.
Type valueType = value->getType()->getRValueType();
ProtocolConformance *conformance = nullptr;
bool conforms =
tc.conformsToProtocol(valueType, bridgedProto, cs.DC,
(ConformanceCheckFlags::InExpression|
ConformanceCheckFlags::Used),
&conformance);
bool conforms = tc.conformsToProtocol(valueType, bridgedProto, cs.DC,
ConformanceCheckFlags::InExpression,
&conformance);
assert(conforms && "Should already have checked the conformance");
(void)conforms;
@@ -1320,8 +1318,7 @@ namespace {
= tc.conformsToProtocol(valueType,
bridgedProto,
cs.DC,
(ConformanceCheckFlags::InExpression|
ConformanceCheckFlags::Used),
ConformanceCheckFlags::InExpression,
&conformance);
FuncDecl *fn = nullptr;