File tree Expand file tree Collapse file tree 1 file changed +1
-11
lines changed Expand file tree Collapse file tree 1 file changed +1
-11
lines changed Original file line number Diff line number Diff line change @@ -385,11 +385,6 @@ namespace {
385
385
if (argTy->isDoubleType () && paramTy->isCGFloatType ())
386
386
return false ;
387
387
388
- // CGFloat could be passed to a Double parameter and that's
389
- // is either equivalent of widening conversion.
390
- if (argTy->isCGFloatType () && paramTy->isDoubleType ())
391
- return true ;
392
-
393
388
llvm::SmallSetVector<ProtocolDecl *, 2 > literalProtos;
394
389
if (auto argTypeVar = argTy->getAs <TypeVariableType>()) {
395
390
auto constraints = CS.getConstraintGraph ().gatherConstraints (
@@ -550,12 +545,7 @@ namespace {
550
545
551
546
auto resultTy = choice->getResult ();
552
547
// Result type of the call matches expected contextual type.
553
- if (contextualTy->isEqual (resultTy))
554
- return true ;
555
-
556
- // Double and CGFloat could be used interchangeably, so let's
557
- // favor widening conversion going from CGFloat to Double.
558
- return resultTy->isCGFloatType () && contextualTy->isDoubleType ();
548
+ return contextualTy->isEqual (resultTy);
559
549
}
560
550
561
551
// / Favor unary operator constraints where we have exact matches
You can’t perform that action at this time.
0 commit comments