---

yaml
---
r: 294319
b: refs/heads/tensorflow
c: 2587df2
h: refs/heads/master
i:
  294317: 0fbde4d
  294315: 0abb9cd
  294311: fb54ae5
  294303: 28d06ba

Author: drodriguez

[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: b67b45aae68e55c2361f77d915412ea0169a94a5
+refs/heads/tensorflow: 2587df23337284d9b3744c158dc94468bd790ffe
 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/benchmark/single-source/SetTests.swift

@@ -3,46 +3,97 @@
 # a top-level build of the CMAKE_SOURCE_DIR. Otherwise, define a guard variable
 # and return.
 if(DEFINED SWIFT_MASTER_LOADED
-  OR NOT ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
+    OR NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   set(SWIFT_MASTER_LOADED TRUE)
   return()
 endif()
 
-set(CMAKE_INSTALL_PREFIX "${SWIFT_DEST_ROOT}${TOOLCHAIN_DIR}/usr")
 
-set(SWIFT_STDLIB_BUILD_TYPE "Release" CACHE STRING
-    "Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
+# -----------------------------------------------------------------------------
+# Preconditions
+
+include(SwiftUtils)
+
+precondition(CMAKE_INSTALL_PREFIX)
+precondition(SWIFT_DEST_ROOT)
+precondition(SWIFT_HOST_VARIANT_SDK)
+precondition(SWIFT_SOURCE_ROOT)
+precondition(TOOLCHAIN_DIR)
+
+
+# -----------------------------------------------------------------------------
+# Cache Variables and Options
+
+set(SWIFT_SOURCE_DIR "${SWIFT_SOURCE_ROOT}/swift" CACHE PATH
+  "Path to the directory containing the Swift sources.")
+
+set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
+  "The name of the toolchain to pass to 'xcrun'.")
+
+set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING
+    "Minimum deployment target version for macOS.")
+set(SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS "7.0" CACHE STRING
+    "Minimum deployment target version for iOS.")
+set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "9.0" CACHE STRING
+    "Minimum deployment target version for tvOS.")
+set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "2.0" CACHE STRING
+    "Minimum deployment target version for watchOS.")
+
+set(SWIFT_INSTALL_COMPONENTS "sdk-overlay" CACHE STRING
+  "A semicolon-separated list of install components.")
+
+set(SWIFT_SDKS "${SWIFT_HOST_VARIANT_SDK}" CACHE STRING
+  "List of Swift SDKs to build.")
+
+set(SWIFT_NATIVE_LLVM_TOOLS_PATH "${TOOLCHAIN_DIR}/usr/bin" CACHE STRING
+  "Path to LLVM tools that are executable on the build machine.")
+set(SWIFT_NATIVE_CLANG_TOOLS_PATH "${TOOLCHAIN_DIR}/usr/bin" CACHE STRING
+  "Path to Clang tools that are executable on the build machine.")
+set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${TOOLCHAIN_DIR}/usr/bin" CACHE STRING
+  "Path to Swift tools that are executable on the build machine.")
+
+option(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES
+  "Generate .swiftinterface files alongside .swiftmodule files."
+  TRUE)
+
+set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
+  "Build type for the Swift standard library and SDK overlays.")
+
 set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
-    STRINGS "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
+  STRINGS
+    "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
 
-# Only happens if it's called from a top-level cmake invocation.
-set(BUILD_STANDALONE TRUE)
-set(SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES "SHARED")
-set(SWIFT_INSTALL_COMPONENTS "sdk-overlay" CACHE STRING "")
-set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING "")
-set(SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS "7.0" CACHE STRING "")
-set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "9.0" CACHE STRING "")
-set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "2.0" CACHE STRING "")
-set(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES TRUE)
+# -----------------------------------------------------------------------------
+# Constants
 
-set(SWIFT_SOURCE_DIR "${SWIFT_SOURCE_ROOT}/swift" CACHE PATH "")
-set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${TOOLCHAIN_DIR}/usr/bin" CACHE PATH "")
-set(SWIFT_SDKS ${SWIFT_HOST_VARIANT_SDK})
+set(CMAKE_INSTALL_PREFIX
+  "${SWIFT_DEST_ROOT}${TOOLCHAIN_DIR}/usr")
 
 list(APPEND CMAKE_MODULE_PATH
   "${SWIFT_SOURCE_ROOT}/llvm/cmake/modules"
-  "${PROJECT_SOURCE_DIR}/../../../../cmake/modules")
+  "${PROJECT_SOURCE_DIR}/../../../../cmake/modules"
+  "${PROJECT_SOURCE_DIR}/../../../cmake/modules")
 
-set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
-    "The name of the toolchain to pass to 'xcrun'")
+
+set(SWIFT_APPLE_PLATFORMS
+  OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR)
+
+# Flags used to indicate we are building a standalone overlay.
+# FIXME: We should cut this down to a single flag.
+set(BUILD_STANDALONE TRUE)
+set(SWIFT_BUILD_STANDALONE_OVERLAY TRUE)
+
+set(SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES "SHARED")
+
+
+# -----------------------------------------------------------------------------
 
 include(SwiftToolchainUtils)
 if(NOT SWIFT_LIPO)
   find_toolchain_tool(SWIFT_LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
 endif()
 
 include(AddLLVM)
-include(SwiftUtils)
 include(SwiftSharedCMakeConfig)
 include(AddSwift)
 include(SwiftHandleGybSources)
@@ -51,25 +102,22 @@ include(SwiftSource)
 include(SwiftComponents)
 include(DarwinSDKs)
 
-# These variables should be passed as -D variables to cmake.
-# e.g. cmake -G Ninja -DSWIFT_HOST_VARIANT_SDK=OSX ..
-precondition(CMAKE_INSTALL_PREFIX)
-precondition(SWIFT_SOURCE_ROOT)
-precondition(SWIFT_DEST_ROOT)
-precondition(SWIFT_HOST_VARIANT_SDK)
-precondition(TOOLCHAIN_DIR)
 
 # Without this line, installing components is broken. This needs refactoring.
 swift_configure_components()
 
-# Some overlays include the runtime's headers,
-# and some of those headers are generated at build time.
-add_subdirectory("${SWIFT_SOURCE_DIR}/include" "${SWIFT_SOURCE_DIR}/include")
-add_subdirectory("${SWIFT_SOURCE_DIR}/apinotes" "${SWIFT_SOURCE_DIR}/apinotes")
 
-precondition(unknown_sdks NEGATE MESSAGE "Unknown SDKs: ${unknown_sdks}")
-precondition(SWIFT_CONFIGURED_SDKS MESSAGE "No SDKs selected.")
-precondition(SWIFT_HOST_VARIANT_SDK MESSAGE "No SDK for host tools.")
+list_subtract(
+  "${SWIFT_SDKS}"
+  "${SWIFT_CONFIGURED_SDKS}"
+  unknown_sdks)
+
+precondition(unknown_sdks NEGATE
+  MESSAGE
+    "Unknown SDKs: ${unknown_sdks}")
+
 
-# ARCH is set somewhere later.
-#precondition(SWIFT_HOST_VARIANT_ARCH MESSAGE "No arch for host tools")
+# Some overlays include the runtime's headers, and some of those headers are
+# generated at build time.
+add_subdirectory("${SWIFT_SOURCE_DIR}/include" "${SWIFT_SOURCE_DIR}/include")
+add_subdirectory("${SWIFT_SOURCE_DIR}/apinotes" "${SWIFT_SOURCE_DIR}/apinotes")

branches/tensorflow/cmake/modules/StandaloneOverlay.cmake

@@ -1106,7 +1106,7 @@ Possible Restrictions on Classes
 --------------------------------
 
 In addition to ``final``, it may be useful to restrict the stored properties of
-a class instance, like `Fixed-Contents Structs`_. However, there are open
+a class instance, like `Frozen Structs`_. However, there are open
 questions about how this would actually work, and the compiler still wouldn't
 be able to make much use of the information, because classes from other
 libraries must almost always be allocated on the heap.

branches/tensorflow/docs/LibraryEvolution.rst

@@ -5323,6 +5323,8 @@ class ParamDecl : public VarDecl {
 
   SourceRange getSourceRange() const;
 
+  AnyFunctionType::Param toFunctionParam(Type type = Type()) const;
+
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { 
     return D->getKind() == DeclKind::Param;

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

@@ -45,6 +45,8 @@ KNOWN_STDLIB_TYPE_DECL(Float,  NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Double, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Float80, NominalTypeDecl, 0)
 
+KNOWN_STDLIB_TYPE_DECL(_MaxBuiltinFloatType, TypeAliasDecl, 0)
+
 KNOWN_STDLIB_TYPE_DECL(String, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Substring, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Array, NominalTypeDecl, 1)

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

@@ -127,12 +127,6 @@ class alignas(ParamDecl *) ParameterList final :
   /// based on the interface types of the parameters in this list.
   void getParams(SmallVectorImpl<AnyFunctionType::Param> &params) const;
 
-  /// Return a list of function parameters for this parameter list,
-  /// based on types provided by a callback.
-  void getParams(SmallVectorImpl<AnyFunctionType::Param> &params,
-                 llvm::function_ref<Type(ParamDecl *)> getType) const;
-
-
   /// Return the full source range of this parameter.
   SourceRange getSourceRange() const;
   SourceLoc getStartLoc() const { return getSourceRange().Start; }

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

@@ -138,8 +138,7 @@ class ProtocolConformanceRef {
   static Type
   getTypeWitnessByName(Type type,
                        ProtocolConformanceRef conformance,
-                       Identifier name,
-                       LazyResolver *resolver);
+                       Identifier name);
 
   /// Determine whether this conformance is canonical.
   bool isCanonical() const;
@@ -154,11 +153,6 @@ class ProtocolConformanceRef {
   /// Get any additional requirements that are required for this conformance to
   /// be satisfied.
   ArrayRef<Requirement> getConditionalRequirements() const;
-  
-  /// If this is a conformance reference for a protocol that inherits other
-  /// protocols, get a reference to the related conformance for the inherited
-  /// protocol.
-  ProtocolConformanceRef getInheritedConformanceRef(ProtocolDecl *base) const;
 };
 
 } // end namespace swift

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

@@ -4225,13 +4225,8 @@ Type ASTContext::getBridgedToObjC(const DeclContext *dc, Type type,
       *bridgedValueType = type;
 
     // Find the Objective-C class type we bridge to.
-    if (conformance->isConcrete()) {
-      return ProtocolConformanceRef::getTypeWitnessByName(
-               type, *conformance, Id_ObjectiveCType,
-               getLazyResolver());
-    } else {
-      return type->castTo<ArchetypeType>()->getNestedType(Id_ObjectiveCType);
-    }
+    return ProtocolConformanceRef::getTypeWitnessByName(
+        type, *conformance, Id_ObjectiveCType);
   }
 
   // Do we conform to Error?

branches/tensorflow/lib/AST/ASTContext.cpp

@@ -5673,6 +5673,21 @@ Type ParamDecl::getVarargBaseTy(Type VarArgT) {
   return T;
 }
 
+AnyFunctionType::Param ParamDecl::toFunctionParam(Type type) const {
+  if (!type)
+    type = getInterfaceType();
+
+  if (isVariadic())
+    type = ParamDecl::getVarargBaseTy(type);
+
+  auto label = getArgumentName();
+  auto flags = ParameterTypeFlags::fromParameterType(type,
+                                                     isVariadic(),
+                                                     isAutoClosure(),
+                                                     getValueOwnership());
+  return AnyFunctionType::Param(type, label, flags);
+}
+
 void ParamDecl::setDefaultValue(Expr *E) {
   if (!DefaultValueAndFlags.getPointer()) {
     if (!E) return;

branches/tensorflow/lib/AST/Decl.cpp

@@ -2057,13 +2057,6 @@ TypeDecl *EquivalenceClass::lookupNestedType(
               != proto->getParentModule())
           continue;
 
-        // Resolve the signature of this type.
-        if (!type->hasInterfaceType()) {
-          type->getASTContext().getLazyResolver()->resolveDeclSignature(type);
-          if (!type->hasInterfaceType())
-            continue;
-        }
-
         concreteDecls.push_back(type);
         continue;
       }

branches/tensorflow/lib/AST/GenericSignatureBuilder.cpp

@@ -89,29 +89,8 @@ ParameterList *ParameterList::clone(const ASTContext &C,
 
 void ParameterList::getParams(
                         SmallVectorImpl<AnyFunctionType::Param> &params) const {
-  getParams(params,
-            [](ParamDecl *decl) { return decl->getInterfaceType(); });
-}
-
-void ParameterList::getParams(
-                          SmallVectorImpl<AnyFunctionType::Param> &params,
-                          llvm::function_ref<Type(ParamDecl *)> getType) const {
-  if (size() == 0)
-    return;
-
-  for (auto P : *this) {
-    auto type = getType(P);
-
-    if (P->isVariadic())
-      type = ParamDecl::getVarargBaseTy(type);
-
-    auto label = P->getArgumentName();
-    auto flags = ParameterTypeFlags::fromParameterType(type,
-                                                       P->isVariadic(),
-                                                       P->isAutoClosure(),
-                                                       P->getValueOwnership());
-    params.emplace_back(type, label, flags);
-  }
+  for (auto P : *this)
+    params.push_back(P->toFunctionParam());
 }
 
 

branches/tensorflow/lib/AST/Parameter.cpp

@@ -144,13 +144,13 @@ ProtocolConformanceRef::subst(Type origType,
 Type
 ProtocolConformanceRef::getTypeWitnessByName(Type type,
                                              ProtocolConformanceRef conformance,
-                                             Identifier name,
-                                             LazyResolver *resolver) {
+                                             Identifier name) {
   assert(!conformance.isInvalid());
 
   // Find the named requirement.
+  ProtocolDecl *proto = conformance.getRequirement();
   AssociatedTypeDecl *assocType = nullptr;
-  auto members = conformance.getRequirement()->lookupDirect(name);
+  auto members = proto->lookupDirect(name);
   for (auto member : members) {
     assocType = dyn_cast<AssociatedTypeDecl>(member);
     if (assocType)
@@ -161,21 +161,8 @@ ProtocolConformanceRef::getTypeWitnessByName(Type type,
   if (!assocType)
     return nullptr;
 
-  if (conformance.isAbstract()) {
-    // For an archetype, retrieve the nested type with the appropriate
-    // name. There are no conformance tables.
-    if (auto archetype = type->getAs<ArchetypeType>()) {
-      return archetype->getNestedType(name);
-    }
-
-    return DependentMemberType::get(type, assocType);
-  }
-
-  auto concrete = conformance.getConcrete();
-  if (!concrete->hasTypeWitness(assocType, resolver)) {
-    return nullptr;
-  }
-  return concrete->getTypeWitness(assocType, resolver);
+  return assocType->getDeclaredInterfaceType().subst(
+    SubstitutionMap::getProtocolSubstitutions(proto, type, conformance));
 }
 
 void *ProtocolConformance::operator new(size_t bytes, ASTContext &context,
@@ -500,37 +487,6 @@ ProtocolConformanceRef::getConditionalRequirements() const {
     return {};
 }
 
-ProtocolConformanceRef
-ProtocolConformanceRef::getInheritedConformanceRef(ProtocolDecl *base) const {
-  if (isAbstract()) {
-    assert(getRequirement()->inheritsFrom(base));
-    return ProtocolConformanceRef(base);
-  }
-
-  auto concrete = getConcrete();
-  auto proto = concrete->getProtocol();
-  auto path =
-    proto->getGenericSignature()->getConformanceAccessPath(
-                                            proto->getSelfInterfaceType(), base);
-  ProtocolConformanceRef result = *this;
-  Type resultType = concrete->getType();
-  bool first = true;
-  for (const auto &step : path) {
-    if (first) {
-      assert(step.first->isEqual(proto->getSelfInterfaceType()));
-      assert(step.second == proto);
-      first = false;
-      continue;
-    }
-
-    result =
-        result.getAssociatedConformance(resultType, step.first, step.second);
-    resultType = result.getAssociatedType(resultType, step.first);
-  }
-
-  return result;
-}
-
 void NormalProtocolConformance::differenceAndStoreConditionalRequirements()
     const {
   switch (CRState) {