---

yaml
---
r: 327676
b: refs/heads/tensorflow
c: 7b1b0a0
h: refs/heads/master

Author: atrick

[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: a17573ab51d72d6d65552565b6b9d1083025d48b
+refs/heads/tensorflow: 7b1b0a00770d87d122b95341d3685889b272c1f5
 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/README.md

@@ -14,6 +14,9 @@
 
 | **OS** | **Architecture** | **Build** |
 |---|:---:|:---:|
+|**[Debian 9.1 (Raspberry Pi)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/armv7_debian_stretch.json)** | ARMv7 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_1/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_1)|
+|**[Fedora 27](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_fedora_27.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-fedora-27/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-fedora-27)|
+|**[Ubuntu 16.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04)|
 |**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/ppc64le_ubuntu_16_04.json)** | PPC64LE |[![Build Status](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le)|
 |**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/aarch64_ubuntu_16.04.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64)|
 |**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | ARMv7 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android)|

branches/tensorflow/docs/SIL.rst

@@ -2525,9 +2525,10 @@ except that ``destroy_addr`` may be used even if ``%0`` is of an
 address-only type.  This does not deallocate memory; it only destroys the
 pointed-to value, leaving the memory uninitialized.
 
-If ``T`` is a trivial type, then ``destroy_addr`` is a no-op. However, even a
-memory location ``%a`` with a trivial type must not be accessed after a
-``destroy_addr %a``.
+If ``T`` is a trivial type, then ``destroy_addr`` can be safely
+eliminated. However, a memory location ``%a`` must not be accessed
+after ``destroy_addr %a`` (which has not yet been eliminated)
+regardless of its type.
 
 index_addr
 ``````````

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

@@ -98,8 +98,6 @@ ERROR(new_decl_without_intro,none,"%0 is a new API without @available attribute"
 
 ERROR(objc_name_change,none,"%0 has ObjC name change from %1 to %2", (StringRef, StringRef, StringRef))
 
-ERROR(desig_init_added,none,"%0 has been added as a designated initializer to an open class", (StringRef))
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

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

@@ -140,13 +140,52 @@ class alignas(ModuleDecl::ImportedModule) ImportCache {
     return !getAllVisibleAccessPaths(mod, dc).empty();
   }
 
+  /// Determines if 'mod' is visible from 'dc' as a result of a scoped import.
+  /// Note that if 'mod' was not imported from 'dc' at all, this also returns
+  /// false.
+  bool isScopedImport(const ModuleDecl *mod, DeclBaseName name,
+                      const DeclContext *dc) {
+    auto accessPaths = getAllVisibleAccessPaths(mod, dc);
+    for (auto accessPath : accessPaths) {
+      if (accessPath.empty())
+        continue;
+      if (ModuleDecl::matchesAccessPath(accessPath, name))
+        return true;
+    }
+
+    return false;
+  }
+
   /// Returns all access paths in 'mod' that are visible from 'dc' if we
   /// subtract imports of 'other'.
   ArrayRef<ModuleDecl::AccessPathTy>
   getAllAccessPathsNotShadowedBy(const ModuleDecl *mod,
                                  const ModuleDecl *other,
                                  const DeclContext *dc);
 
+  /// Returns 'true' if a declaration named 'name' defined in 'other' shadows
+  /// defined in 'mod', because no access paths can find 'name' in 'mod' from
+  /// 'dc' if we ignore imports of 'other'.
+  bool isShadowedBy(const ModuleDecl *mod,
+                    const ModuleDecl *other,
+                    DeclBaseName name,
+                    const DeclContext *dc) {
+     auto accessPaths = getAllAccessPathsNotShadowedBy(mod, other, dc);
+     return llvm::none_of(accessPaths,
+                          [&](ModuleDecl::AccessPathTy accessPath) {
+                            return ModuleDecl::matchesAccessPath(accessPath, name);
+                          });
+  }
+
+  /// Qualified lookup into types uses a slightly different check that does not
+  /// take access paths into account.
+  bool isShadowedBy(const ModuleDecl *mod,
+                    const ModuleDecl *other,
+                    const DeclContext *dc) {
+    auto accessPaths = getAllAccessPathsNotShadowedBy(mod, other, dc);
+    return accessPaths.empty();
+  }
+
   /// This is a hack to cope with main file parsing and REPL parsing, where
   /// we can add ImportDecls after name binding.
   void clear() {

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

@@ -109,7 +109,6 @@ struct PropertyWrapperMutability {
       }
       return std::max(Getter, Setter);
     }
-    llvm_unreachable("Unhandled Value in switch");
   }
 
   bool operator==(PropertyWrapperMutability other) const {

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

@@ -167,7 +167,6 @@ class Requirement {
     case RequirementKind::Layout:
       return lhs.getLayoutConstraint() == rhs.getLayoutConstraint();
     }
-    llvm_unreachable("Unhandled RequirementKind in switch");
   }
 };
 

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

@@ -54,7 +54,6 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
   case ResilienceExpansion::Maximal:
     return os << "Maximal";
   }
-  llvm_unreachable("Unhandled ResilienceExpansion in switch");
 }
 
 } // namespace swift

branches/tensorflow/include/swift/IDE/DigesterEnums.def

@@ -152,7 +152,6 @@ KEY_STRING(IntrotvOS, intro_tvOS)
 KEY_STRING(IntrowatchOS, intro_watchOS)
 KEY_STRING(Introswift, intro_swift)
 KEY_STRING(ObjCName, objc_name)
-KEY_STRING(InitKind, init_kind)
 
 KEY_STRING_ARR(SuperclassNames, superclassNames)
 KEY_STRING_ARR(ToolArgs, tool_arguments)

branches/tensorflow/include/swift/Runtime/ObjCBridge.h

@@ -79,11 +79,6 @@ namespace swift {
 SWIFT_RUNTIME_EXPORT
 void swift_rootObjCDealloc(HeapObject *self);
 
-// Uses Swift bridging to box a C string into an NSString without introducing
-// a link-time dependency on NSString.
-SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
-id swift_stdlib_NSStringFromUTF8(const char *cstr, int len);
-
 }
 
 #endif // SWIFT_OBJC_INTEROP

branches/tensorflow/include/swift/SIL/AbstractionPattern.h

@@ -402,7 +402,6 @@ class AbstractionPattern {
     case Kind::Tuple:
       return false;
     }
-    llvm_unreachable("Unhandled AbstractionPatternKind in switch");
   }
 
   CanGenericSignature getGenericSignature() const {

branches/tensorflow/include/swift/Sema/IDETypeChecking.h

@@ -47,6 +47,10 @@ namespace swift {
   /// \returns true on convertible, false on not.
   bool isConvertibleTo(Type T1, Type T2, bool openArchetypes, DeclContext &DC);
 
+  bool isEqual(Type T1, Type T2, DeclContext &DC);
+
+  bool canPossiblyEqual(Type T1, Type T2, DeclContext &DC);
+
   void collectDefaultImplementationForProtocolMembers(ProtocolDecl *PD,
                         llvm::SmallDenseMap<ValueDecl*, ValueDecl*> &DefaultMap);
 

branches/tensorflow/include/swift/Sema/IDETypeCheckingRequests.h

@@ -87,6 +87,8 @@ class IsDeclApplicableRequest:
 // Type relation checking
 //----------------------------------------------------------------------------//
 enum class TypeRelation: uint8_t {
+  EqualTo,
+  PossiblyEqualTo,
   ConvertTo,
 };
 
@@ -156,6 +158,8 @@ struct TypeRelationCheckInput {
     out << " is ";
     switch(owner.Relation) {
 #define CASE(NAME) case TypeRelation::NAME: out << #NAME << " "; break;
+    CASE(EqualTo)
+    CASE(PossiblyEqualTo)
     CASE(ConvertTo)
 #undef CASE
     }

branches/tensorflow/lib/AST/ASTContext.cpp

@@ -4477,7 +4477,6 @@ bool ASTContext::overrideGenericSignatureReqsSatisfied(
   case OverrideGenericSignatureReqCheck::DerivedReqSatisfiedByBase:
     return derivedSig->requirementsNotSatisfiedBy(sig).empty();
   }
-  llvm_unreachable("Unhandled OverrideGenericSignatureReqCheck in switch");
 }
 
 SILLayout *SILLayout::get(ASTContext &C,

branches/tensorflow/lib/AST/ASTScope.cpp

@@ -53,17 +53,7 @@ Optional<bool> ASTScope::computeIsCascadingUse(
   return ASTScopeImpl::computeIsCascadingUse(history, initialIsCascadingUse);
 }
 
-#if SWIFT_COMPILER_IS_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
-
 void ASTScope::dump() const { impl->dump(); }
-
-#if SWIFT_COMPILER_IS_MSVC
-#pragma warning(pop)
-#endif
-
 void ASTScope::print(llvm::raw_ostream &out) const { impl->print(out); }
 void ASTScope::dumpOneScopeMapLocation(std::pair<unsigned, unsigned> lineCol) {
   impl->dumpOneScopeMapLocation(lineCol);

branches/tensorflow/lib/AST/ASTScopeCreation.cpp

@@ -1178,7 +1178,6 @@ ConditionalClauseScope::expandAScopeThatCreatesANewInsertionPoint(
     return {ccPatternUseScope,
             "Succeeding code must be in scope of conditional variables"};
   }
-  llvm_unreachable("Unhandled StmtConditionKind in switch");
 }
 
 AnnotatedInsertionPoint

branches/tensorflow/lib/AST/Decl.cpp

@@ -7660,7 +7660,6 @@ ParseAbstractFunctionBodyRequest::getCachedResult() const {
   case BodyKind::Unparsed:
     return None;
   }
-  llvm_unreachable("Unhandled BodyKing in switch");
 }
 
 void ParseAbstractFunctionBodyRequest::cacheResult(BraceStmt *value) const {

branches/tensorflow/lib/AST/DeclContext.cpp

@@ -1037,7 +1037,6 @@ SourceLoc swift::extractNearestSourceLoc(const DeclContext *dc) {
   case DeclContextKind::SerializedLocal:
     return extractNearestSourceLoc(dc->getParent());
   }
-  llvm_unreachable("Unhandled DeclCopntextKindin switch");
 }
 
 #define DECL(Id, Parent) \

branches/tensorflow/lib/AST/GenericSignature.cpp

@@ -1091,5 +1091,4 @@ Requirement Requirement::getCanonical() const {
   case RequirementKind::Layout:
     return Requirement(getKind(), firstType, getLayoutConstraint());
   }
-  llvm_unreachable("Unhandled RequirementKind in switch");
 }

branches/tensorflow/lib/AST/NameLookup.cpp

@@ -193,27 +193,6 @@ static void recordShadowedDeclsAfterSignatureMatch(
     auto firstDecl = decls[firstIdx];
     auto firstModule = firstDecl->getModuleContext();
     auto name = firstDecl->getBaseName();
-
-    auto isShadowed = [&](ArrayRef<ModuleDecl::AccessPathTy> paths) {
-      for (auto path : paths) {
-        if (ModuleDecl::matchesAccessPath(path, name))
-          return false;
-      }
-
-      return true;
-    };
-
-    auto isScopedImport = [&](ArrayRef<ModuleDecl::AccessPathTy> paths) {
-      for (auto path : paths) {
-        if (path.empty())
-          continue;
-        if (ModuleDecl::matchesAccessPath(path, name))
-          return true;
-      }
-
-      return false;
-    };
-
     for (unsigned secondIdx : range(firstIdx + 1, decls.size())) {
       // Determine whether one module takes precedence over another.
       auto secondDecl = decls[secondIdx];
@@ -227,28 +206,22 @@ static void recordShadowedDeclsAfterSignatureMatch(
       if (firstModule != secondModule &&
           firstDecl->getDeclContext()->isModuleScopeContext() &&
           secondDecl->getDeclContext()->isModuleScopeContext()) {
-        auto firstPaths = imports.getAllAccessPathsNotShadowedBy(
-          firstModule, secondModule, dc);
-        auto secondPaths = imports.getAllAccessPathsNotShadowedBy(
-          secondModule, firstModule, dc);
-
-        // Check if one module shadows the other.
-        if (isShadowed(firstPaths)) {
+        // First, scoped imports shadow unscoped imports.
+        bool firstScoped = imports.isScopedImport(firstModule, name, dc);
+        bool secondScoped = imports.isScopedImport(secondModule, name, dc);
+        if (!firstScoped && secondScoped) {
           shadowed.insert(firstDecl);
           break;
-        } else if (isShadowed(secondPaths)) {
+        } else if (firstScoped && !secondScoped) {
           shadowed.insert(secondDecl);
           continue;
         }
 
-        // We might be in a situation where neither module shadows the
-        // other, but one declaration is visible via a scoped import.
-        bool firstScoped = isScopedImport(firstPaths);
-        bool secondScoped = isScopedImport(secondPaths);
-        if (!firstScoped && secondScoped) {
+        // Now check if one module shadows the other.
+        if (imports.isShadowedBy(firstModule, secondModule, name, dc)) {
           shadowed.insert(firstDecl);
           break;
-        } else if (firstScoped && !secondScoped) {
+        } else if (imports.isShadowedBy(secondModule, firstModule, name, dc)) {
           shadowed.insert(secondDecl);
           continue;
         }
@@ -305,16 +278,10 @@ static void recordShadowedDeclsAfterSignatureMatch(
       if (firstModule != secondModule &&
           !firstDecl->getDeclContext()->isModuleScopeContext() &&
           !secondDecl->getDeclContext()->isModuleScopeContext()) {
-        auto firstPaths = imports.getAllAccessPathsNotShadowedBy(
-          firstModule, secondModule, dc);
-        auto secondPaths = imports.getAllAccessPathsNotShadowedBy(
-          secondModule, firstModule, dc);
-
-        // Check if one module shadows the other.
-        if (isShadowed(firstPaths)) {
+        if (imports.isShadowedBy(firstModule, secondModule, dc)) {
           shadowed.insert(firstDecl);
           break;
-        } else if (isShadowed(secondPaths)) {
+        } else if (imports.isShadowedBy(secondModule, firstModule, dc)) {
           shadowed.insert(secondDecl);
           continue;
         }

branches/tensorflow/lib/AST/Type.cpp

@@ -1479,11 +1479,7 @@ bool TypeBase::isExactSuperclassOf(Type ty) {
          ty->getSuperclass()->getAnyNominal()->hasClangNode())))
     return false;
 
-  SmallPtrSet<ClassDecl *, 8> seen;
   do {
-    if (auto *classDecl = ty->getClassOrBoundGenericClass())
-      if (!seen.insert(classDecl).second)
-        return false;
     if (ty->isEqual(this))
       return true;
   } while ((ty = ty->getSuperclass()));
@@ -1514,10 +1510,6 @@ bool TypeBase::isBindableTo(Type b) {
       if (orig->requiresClass() && !subst->satisfiesClassConstraint())
         return false;
 
-      if (auto superclass = orig->getSuperclass())
-        if (!superclass->isBindableToSuperclassOf(subst))
-          return false;
-
       // TODO: If the archetype has a superclass constraint, check that the
       // substitution is a subclass.
 
@@ -1536,7 +1528,7 @@ bool TypeBase::isBindableTo(Type b) {
       if (CanType(orig) == subst)
         return true;
 
-      return false;
+      llvm_unreachable("not a valid canonical type substitution");
     }
 
     bool visitNominalType(NominalType *nom, CanType subst) {
@@ -1588,20 +1580,17 @@ bool TypeBase::isBindableTo(Type b) {
     }
 
     bool visitDependentMemberType(DependentMemberType *dt, CanType subst) {
-      return true;
+      llvm_unreachable("can't visit dependent types");
     }
     bool visitGenericTypeParamType(GenericTypeParamType *dt, CanType subst) {
-      return true;
+      llvm_unreachable("can't visit dependent types");
     }
 
     bool visitFunctionType(FunctionType *func, CanType subst) {
       if (auto substFunc = dyn_cast<FunctionType>(subst)) {
         if (func->getExtInfo() != substFunc->getExtInfo())
           return false;
 
-        if (func->getParams().size() != substFunc->getParams().size())
-          return false;
-
         for (unsigned i : indices(func->getParams())) {
           if (!visit(func->getParams()[i].getOldType(),
                      substFunc.getParams()[i].getOldType()))
@@ -1719,13 +1708,20 @@ bool TypeBase::isBindableToSuperclassOf(Type ty) {
   if (!ty->mayHaveSuperclass())
     return false;
 
-  SmallPtrSet<ClassDecl *, 8> seen;
+  // If the type is itself an archetype, we could always potentially bind it
+  // to the superclass (via external retroactive conformance, even if the
+  // type isn't statically known to conform).
+  //
+  // We could theoretically reject cases where the set of conformances is known
+  // (say the protocol or classes are private or internal).
+  if (is<ArchetypeType>())
+    return true;
+  
   do {
-    if (auto *classDecl = ty->getClassOrBoundGenericClass())
-      if (!seen.insert(classDecl).second)
-        return false;
     if (isBindableTo(ty))
       return true;
+    if (ty->getAnyNominal() && ty->getAnyNominal()->isInvalid())
+      return false;
   } while ((ty = ty->getSuperclass()));
   return false;
 }