---

yaml
---
r: 349604
b: refs/heads/master-next
c: 83bf812
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 6ce93ce73af9c0dfd965071a7396b4ac890c03fd
+refs/heads/master-next: 83bf812d9190f82f073c36d6a8c441df9e9d78ac
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/SILOptimizer/Mandatory/SemanticARCOpts.cpp

@@ -191,9 +191,7 @@ struct SemanticARCOptVisitor
   bool visitBeginBorrowInst(BeginBorrowInst *bbi);
   bool visitLoadInst(LoadInst *li);
 
-  /// Return true if all of load insts destroy_value users are within the
-  /// guaranteed lifetime of the storage that is being loaded from.
-  bool isLoadGuaranteedByStorage(LoadInst *li);
+  bool isWrittenTo(LoadInst *li);
 
   bool processWorklist();
 
@@ -716,7 +714,7 @@ class StorageGuaranteesLoadVisitor
 };
 } // namespace
 
-bool SemanticARCOptVisitor::isLoadGuaranteedByStorage(LoadInst *load) {
+bool SemanticARCOptVisitor::isWrittenTo(LoadInst *load) {
   StorageGuaranteesLoadVisitor visitor(*this, load);
   return visitor.doIt();
 }
@@ -738,10 +736,9 @@ bool SemanticARCOptVisitor::visitLoadInst(LoadInst *li) {
   if (!isDeadLiveRange(li, destroyValues))
     return false;
 
-  // Then check if our address is guaranteed to never be written to within the
-  // lifetime of our loaded value. If so, we can convert the loaded value to be
-  // at +0 instead of +1.
-  if (isLoadGuaranteedByStorage(li))
+  // Then check if our address is ever written to. If it is, then we
+  // can not use the load_borrow.
+  if (isWrittenTo(li))
     return false;
 
   // Ok, we can perform our optimization. Convert the load [copy] into a

branches/master-next/lib/Sema/CSSimplify.cpp

@@ -3836,8 +3836,8 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
                                  ConstraintKind kind,
                                  ConstraintLocatorBuilder locator,
                                  TypeMatchOptions flags) {
+  auto *typeVar = type->getAs<TypeVariableType>();
   if (shouldAttemptFixes()) {
-    auto *typeVar = type->getAs<TypeVariableType>();
     // If type variable, associated with this conformance check,
     // has been determined to be a "hole" in constraint system,
     // let's consider this check a success without recording
@@ -3987,6 +3987,23 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
       return SolutionKind::Error;
 
     if (path.back().is<LocatorPathElt::AnyRequirement>()) {
+      // If this is a requirement associated with `Self` which is bound
+      // to `Any`, let's consider this "too incorrect" to continue.
+      //
+      // This helps us to filter out cases like operator overloads where
+      // `Self` type comes from e.g. default for collection element -
+      // `[1, "hello"].map { $0 + 1 }`. Main problem here is that
+      // collection type couldn't be determined without unification to
+      // `Any` and `+` failing for all numeric overloads is just a consequence.
+      if (typeVar && type->isAny()) {
+        auto *GP = typeVar->getImpl().getGenericParameter();
+        if (auto *GPD = GP->getDecl()) {
+          auto *DC = GPD->getDeclContext();
+          if (DC->isTypeContext() && DC->getSelfInterfaceType()->isEqual(GP))
+            return SolutionKind::Error;
+        }
+      }
+
       if (auto *fix =
               fixRequirementFailure(*this, type, protocolTy, anchor, path)) {
         if (!recordFix(fix)) {

branches/master-next/test/Constraints/closures.swift

@@ -182,8 +182,7 @@ func r22162441(_ lines: [String]) {
 
 func testMap() {
   let a = 42
-  [1,a].map { $0 + 1.0 } // expected-error {{binary operator '+' cannot be applied to operands of type 'Any' and 'Double'}}
-  // expected-note @-1 {{expected an argument list of type '(Double, Double)'}}
+  [1,a].map { $0 + 1.0 } // expected-error {{cannot convert value of type 'Int' to expected element type 'Double'}}
 }
 
 // <rdar://problem/22414757> "UnresolvedDot" "in wrong phase" assertion from verifier