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

<rdar://problem/18311362> TLF: Eliminate implicit bridging conversions

Browse Source 
Require 'as' when converting from Objective-C type to native type (but
continue to allow implicit conversion from native to Objective-C). This
conversion constraint is called ExplicitConversion; all implicit
conversions are covered by the existing Conversion constraint. Update
standard library and tests to match.

Swift SVN r24496
This commit is contained in:
Chris Willmore
2015-01-18 00:07:45 +00:00
parent 94bf316fc2
commit 68dd563fbf
36 changed files with 202 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/Constraint.cpp
View File

@@ -49,6 +49,7 @@ Constraint::Constraint(ConstraintKind Kind, Type First, Type Second,
case ConstraintKind::Equal:
case ConstraintKind::Subtype:
case ConstraintKind::Conversion:
case ConstraintKind::ExplicitConversion:
case ConstraintKind::ArgumentConversion:
case ConstraintKind::ArgumentTupleConversion:
case ConstraintKind::OperatorArgumentTupleConversion:
@@ -146,6 +147,7 @@ Constraint *Constraint::clone(ConstraintSystem &cs) const {
case ConstraintKind::Equal:
case ConstraintKind::Subtype:
case ConstraintKind::Conversion:
case ConstraintKind::ExplicitConversion:
case ConstraintKind::ArgumentConversion:
case ConstraintKind::ArgumentTupleConversion:
case ConstraintKind::OperatorArgumentTupleConversion:
@@ -225,6 +227,7 @@ void Constraint::print(llvm::raw_ostream &Out, SourceManager *sm) const {
case ConstraintKind::Equal: Out << " == "; break;
case ConstraintKind::Subtype: Out << " < "; break;
case ConstraintKind::Conversion: Out << " <c "; break;
case ConstraintKind::ExplicitConversion: Out << " <as "; break;
case ConstraintKind::ArgumentConversion: Out << " <a "; break;
case ConstraintKind::ArgumentTupleConversion: Out << " <ac "; break;
case ConstraintKind::OperatorArgumentTupleConversion: Out << " <oac "; break;
@@ -481,6 +484,7 @@ gatherReferencedTypeVars(Constraint *constraint,
case ConstraintKind::Bind:
case ConstraintKind::ArgumentConversion:
case ConstraintKind::Conversion:
case ConstraintKind::ExplicitConversion:
case ConstraintKind::ArgumentTupleConversion:
case ConstraintKind::OperatorArgumentTupleConversion:
case ConstraintKind::OperatorArgumentConversion: