---

yaml
---
r: 294239
b: refs/heads/tensorflow
c: 0b2c004
h: refs/heads/master
i:
  294237: c29baf2
  294235: f80555b
  294231: 45c9d0b
  294223: 3f19246
  294207: 00e11ba

Author: smeenai

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 99134680b3b727e2166823dbf36b373ae7d5e627
+refs/heads/tensorflow: 0b2c004d0d5c811bd3c8b17ee5e4365e5aec5a2e
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/CMakeLists.txt

@@ -1051,6 +1051,12 @@ endif()
 # https://bugs.swift.org/browse/SR-5975
 if(SWIFT_BUILD_STDLIB)
   add_subdirectory(stdlib)
+else()
+  # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
+  # ensure we build that when building tools.
+  if(SWIFT_INCLUDE_TOOLS)
+    add_subdirectory(stdlib/public/Reflection)
+  endif()
 endif()
 
 if(SWIFT_INCLUDE_APINOTES)

branches/tensorflow/include/swift/AST/DiagnosticsSema.def

@@ -857,10 +857,6 @@ ERROR(did_not_call_method,none,
       "method %0 was used as a property; add () to call it",
       (Identifier))
 
-ERROR(init_not_instance_member_use_assignment,none,
-      "'init' is a member of the type; use assignment "
-      "to initalize the value instead", ())
-
 ERROR(init_not_instance_member,none,
       "'init' is a member of the type; use 'type(of: ...)' to initialize "
       "a new object of the same dynamic type", ())

branches/tensorflow/include/swift/AST/SILOptions.h

@@ -51,7 +51,7 @@ class SILOptions {
   bool RemoveRuntimeAsserts = false;
 
   /// Enable existential specializer optimization.
-  bool ExistentialSpecializer = false;
+  bool ExistentialSpecializer = true;
 
   /// Controls whether the SIL ARC optimizations are run.
   bool EnableARCOptimizations = true;

branches/tensorflow/lib/Sema/CSDiagnostics.cpp

@@ -101,35 +101,6 @@ Expr *FailureDiagnostic::getArgumentExprFor(Expr *anchor) const {
   return nullptr;
 }
 
-// TODO: Replace duplications of this logic with calls to this.
-Optional<SelectedOverload> FailureDiagnostic::getChoiceFor(Expr *expr) {
-  auto &cs = getConstraintSystem();
-  ConstraintLocator *locator = nullptr;
-
-  if (auto *AE = dyn_cast<ApplyExpr>(expr)) {
-    if (auto *TE = dyn_cast<TypeExpr>(AE->getFn())) {
-      locator = cs.getConstraintLocator(AE,
-                                        {ConstraintLocator::ApplyFunction,
-                                         ConstraintLocator::ConstructorMember},
-                                        /*summaryFlags=*/0);
-    }
-    return getChoiceFor(AE->getFn());
-  } else if (auto *UDE = dyn_cast<UnresolvedDotExpr>(expr)) {
-    locator = cs.getConstraintLocator(UDE, ConstraintLocator::Member);
-  } else if (auto *UME = dyn_cast<UnresolvedMemberExpr>(expr)) {
-    locator = cs.getConstraintLocator(UME, ConstraintLocator::UnresolvedMember);
-  } else if (auto *SE = dyn_cast<SubscriptExpr>(expr)) {
-    locator = cs.getConstraintLocator(SE, ConstraintLocator::SubscriptMember);
-  } else {
-    locator = cs.getConstraintLocator(expr);
-  }
-
-  if (!locator)
-    return None;
-
-  return getOverloadChoiceIfAvailable(locator);
-}
-
 Type RequirementFailure::getOwnerType() const {
   return getType(getRawAnchor())
       ->getInOutObjectType()
@@ -2048,7 +2019,6 @@ bool MissingMemberFailure::diagnoseAsError() {
 bool AllowTypeOrInstanceMemberFailure::diagnoseAsError() {
   auto loc = getAnchor()->getLoc();
   auto &cs = getConstraintSystem();
-  auto *DC = getDC();
   auto locator = getLocator();
 
   if (loc.isInvalid()) {
@@ -2106,43 +2076,11 @@ bool AllowTypeOrInstanceMemberFailure::diagnoseAsError() {
         emitDiagnostic(loc, diag::super_initializer_not_in_initializer);
         return true;
       }
-
-      auto isCallArgument = [this](Expr *expr) {
-        auto &cs = getConstraintSystem();
-        auto argExpr = cs.getParentExpr(expr);
-        if (!argExpr)
-          return false;
-        auto possibleApplyExpr = cs.getParentExpr(expr);
-        return possibleApplyExpr && isa<ApplyExpr>(possibleApplyExpr);
-      };
-
-      auto *initCall = cs.getParentExpr(cs.getParentExpr(ctorRef));
-
-      auto isMutable = [&DC](ValueDecl *decl) {
-        if (auto *storage = dyn_cast<AbstractStorageDecl>(decl))
-          return storage->isSettable(DC) && storage->isSetterAccessibleFrom(DC);
-
-        return true;
-      };
-
-      auto selection = getChoiceFor(ctorRef->getBase());
-      if (selection) {
-        OverloadChoice choice = selection->choice;
-        if (choice.isDecl() && isMutable(choice.getDecl()) &&
-            !isCallArgument(initCall) &&
-            cs.getContextualTypePurpose() == CTP_Unused) {
-          auto fixItLoc = ctorRef->getBase()->getSourceRange().End;
-          emitDiagnostic(loc, diag::init_not_instance_member_use_assignment)
-              .fixItInsertAfter(fixItLoc, " = ");
-          return true;
-        }
-
-        SourceRange fixItRng = ctorRef->getNameLoc().getSourceRange();
-        emitDiagnostic(loc, diag::init_not_instance_member)
-            .fixItInsert(fixItRng.Start, "type(of: ")
-            .fixItInsertAfter(fixItRng.End, ")");
-        return true;
-      }
+      SourceRange fixItRng = ctorRef->getNameLoc().getSourceRange();
+      emitDiagnostic(loc, diag::init_not_instance_member)
+          .fixItInsert(fixItRng.Start, "type(of: ")
+          .fixItInsertAfter(fixItRng.End, ")");
+      return true;
     }
   }
 

branches/tensorflow/lib/Sema/CSDiagnostics.h

@@ -155,8 +155,6 @@ class FailureDiagnostic {
   /// reference or subscript, nullptr otherwise.
   Expr *getArgumentExprFor(Expr *anchor) const;
 
-  Optional<SelectedOverload> getChoiceFor(Expr *);
-
 private:
   /// Compute anchor expression associated with current diagnostic.
   std::pair<Expr *, bool> computeAnchor() const;

branches/tensorflow/lib/Sema/TypeCheckConstraints.cpp

@@ -2646,12 +2646,9 @@ bool TypeChecker::typeCheckBinding(Pattern *&pattern, Expr *&initializer,
   auto contextualPurpose = CTP_Unused;
   TypeCheckExprOptions flags = TypeCheckExprFlags::ConvertTypeIsOnlyAHint;
 
-  // Set the contextual purpose even if the pattern doesn't have a type so
-  // if there's an error we can use that information to inform diagnostics.
-  contextualPurpose = CTP_Initialization;
-
   if (pattern->hasType()) {
     contextualType = TypeLoc::withoutLoc(pattern->getType());
+    contextualPurpose = CTP_Initialization;
 
     // If we already had an error, don't repeat the problem.
     if (contextualType.getType()->hasError())

branches/tensorflow/stdlib/public/Darwin/Accelerate/AccelerateBuffer.swift

@@ -26,7 +26,7 @@ public protocol AccelerateBuffer {
     /// Calls a closure with a pointer to the object's contiguous storage.
     func withUnsafeBufferPointer<R>(
         _ body: (UnsafeBufferPointer<Element>) throws -> R
-    ) rethrows -> R
+        ) rethrows -> R
 }
 
 /// A mutable object composed of count elements that are stored contiguously
@@ -40,25 +40,23 @@ public protocol AccelerateMutableBuffer: AccelerateBuffer {
     /// contiguous storage.
     mutating func withUnsafeMutableBufferPointer<R>(
         _ body: (inout UnsafeMutableBufferPointer<Element>) throws -> R
-    ) rethrows -> R
+        ) rethrows -> R
 }
 
 @available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
 public extension AccelerateBuffer where Self: Collection {
-    @inlinable
     func withUnsafeBufferPointer<R>(
         _ body: (UnsafeBufferPointer<Element>) throws -> R
-    ) rethrows -> R {
+        ) rethrows -> R {
         return try withContiguousStorageIfAvailable(body)!
     }
 }
 
 @available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
 extension AccelerateMutableBuffer where Self: MutableCollection {
-    @inlinable
     public mutating func withUnsafeMutableBufferPointer<R>(
         _ body: (inout UnsafeMutableBufferPointer<Element>) throws -> R
-    ) rethrows -> R {
+        ) rethrows -> R {
         return try withContiguousMutableStorageIfAvailable(body)!
     }
 }