---

yaml
---
r: 340343
b: refs/heads/rxwei-patch-1
c: 105e4ad
h: refs/heads/master
i:
  340341: 6f5213e
  340339: 87eaa77
  340335: d93e375

Author: yln

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 7beb3585d5edfc24e945afca513c24205e7a47a5
+refs/heads/rxwei-patch-1: 105e4ad592b4a462b03e68136b2d8e39ff40ab8e
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -553,7 +553,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     NumRequirementsInSignature : 16
   );
 
-  SWIFT_INLINE_BITFIELD(ClassDecl, NominalTypeDecl, 1+2+1+2+1+6+1+1+1+1,
+  SWIFT_INLINE_BITFIELD(ClassDecl, NominalTypeDecl, 1+2+1+2+1+6+1+1+1,
     /// Whether this class requires all of its instance variables to
     /// have in-class initializers.
     RequiresStoredPropertyInits : 1,
@@ -581,11 +581,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     AncestryComputed : 1,
 
     HasMissingDesignatedInitializers : 1,
-    HasMissingVTableEntries : 1,
-
-    /// Whether instances of this class are incompatible
-    /// with weak and unowned references.
-    IsIncompatibleWithWeakReferences : 1
+    HasMissingVTableEntries : 1
   );
 
   SWIFT_INLINE_BITFIELD(StructDecl, NominalTypeDecl, 1,
@@ -3864,17 +3860,6 @@ class ClassDecl final : public NominalTypeDecl {
     Bits.ClassDecl.HasMissingVTableEntries = newValue;
   }
 
-  /// Returns true if this class cannot be used with weak or unowned
-  /// references.
-  /// 
-  /// Note that this is true if this class or any of its ancestor classes
-  /// are marked incompatible.
-  bool isIncompatibleWithWeakReferences() const;
-
-  void setIsIncompatibleWithWeakReferences(bool newValue = true) {
-    Bits.ClassDecl.IsIncompatibleWithWeakReferences = newValue;
-  }
-
   /// Find a method of a class that overrides a given method.
   /// Return nullptr, if no such method exists.
   AbstractFunctionDecl *findOverridingDecl(

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -2538,12 +2538,6 @@ NOTE(decodable_suggest_overriding_init_here,none,
 NOTE(codable_suggest_overriding_init_here,none,
      "did you mean to override 'init(from:)' and 'encode(to:)'?", ())
 
-NOTE(missing_member_type_conformance_prevents_synthesis, none,
-     "%select{associated value|stored property}0 type %1 does not conform to "
-     "protocol %2, preventing synthesized conformance "
-     "of %3 to %2",
-     (unsigned, Type, Type, Type))
-
 // Dynamic Self
 ERROR(dynamic_self_non_method,none,
       "%select{global|local}0 function cannot return 'Self'", (bool))
@@ -3156,7 +3150,7 @@ ERROR(jump_out_of_defer,none,
       (StringRef))
 
 WARNING(defer_stmt_at_block_end,none,
-     "'defer' statement at end of scope always executes immediately; "
+     "'defer' statement before end of scope always executes immediately; "
      "replace with 'do' statement to silence this warning", ())
 
 ERROR(return_invalid_outside_func,none,
@@ -3571,9 +3565,6 @@ ERROR(invalid_ownership_protocol_type,none,
       "%0 must not be applied to non-class-bound %1; "
       "consider adding a protocol conformance that has a class bound",
       (ReferenceOwnership, Type))
-ERROR(invalid_ownership_incompatible_class,none,
-      "%0 is incompatible with %1 references",
-      (Type, ReferenceOwnership))
 ERROR(invalid_ownership_with_optional,none,
       "%0 variable cannot have optional type", (ReferenceOwnership))
 ERROR(invalid_ownership_not_optional,none,

branches/rxwei-patch-1/include/swift/AST/Expr.h

@@ -1135,7 +1135,6 @@ class ObjectLiteralExpr final
   Expr *Arg;
   Expr *SemanticExpr;
   SourceLoc PoundLoc;
-  ConcreteDeclRef Initializer;
 
   ObjectLiteralExpr(SourceLoc PoundLoc, LiteralKind LitKind,
                     Expr *Arg,
@@ -1196,15 +1195,6 @@ class ObjectLiteralExpr final
 
   StringRef getLiteralKindPlainName() const;
 
-  /// Retrieve the initializer that will be used to construct the 'object'
-  /// literal from the result of the initializer.
-  ConcreteDeclRef getInitializer() const { return Initializer; }
-
-  /// Set the initializer that will be used to construct the 'object' literal.
-  void setInitializer(ConcreteDeclRef initializer) {
-    Initializer = initializer;
-  }
-
   static bool classof(const Expr *E) {
     return E->getKind() == ExprKind::ObjectLiteral;
   }

branches/rxwei-patch-1/include/swift/AST/KnownIdentifiers.def

@@ -31,7 +31,6 @@ IDENTIFIER(Any)
 IDENTIFIER(ArrayLiteralElement)
 IDENTIFIER(atIndexedSubscript)
 IDENTIFIER_(bridgeToObjectiveC)
-IDENTIFIER(Change)
 IDENTIFIER_WITH_NAME(code_, "_code")
 IDENTIFIER(CodingKeys)
 IDENTIFIER(combine)

branches/rxwei-patch-1/include/swift/AST/KnownStdlibTypes.def

@@ -54,7 +54,6 @@ KNOWN_STDLIB_TYPE_DECL(Array, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Set, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Sequence, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Dictionary, NominalTypeDecl, 2)
-KNOWN_STDLIB_TYPE_DECL(CollectionDifference, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(AnyHashable, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(MutableCollection, ProtocolDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Hasher, NominalTypeDecl, 0)

branches/rxwei-patch-1/include/swift/AST/ParameterList.h

@@ -97,8 +97,7 @@ class alignas(ParamDecl *) ParameterList final :
 
   const ParamDecl *operator[](unsigned i) const { return get(i); }
   ParamDecl *&operator[](unsigned i) { return get(i); }
-  bool hasInternalParameter(StringRef prefix) const;
-
+  
   /// Change the DeclContext of any contained parameters to the specified
   /// DeclContext.
   void setDeclContextOfParamDecls(DeclContext *DC);

branches/rxwei-patch-1/include/swift/SIL/SILVTable.h

@@ -12,14 +12,9 @@
 //
 // This file defines the SILVTable class, which is used to map dynamically
 // dispatchable class methods and properties to their concrete implementations
-// for a dynamic type. This information is used by IRGen to emit class vtables,
-// by the devirtualization pass to promote class_method instructions to static
-// function_refs.
-//
-// Note that vtable layout itself is implemented in SILVTableLayout.h and is
-// independent of the SILVTable; in general, for a class from another module we
-// might not have a SILVTable to deserialize, and for a class in a different
-// translation in the same module the SILVTable is not available either.
+// for a dynamic type. This information is (FIXME will be) used by IRGen to lay
+// out class vtables, and can be used by devirtualization passes to promote
+// class_method instructions to static function_refs.
 //
 //===----------------------------------------------------------------------===//
 
@@ -61,10 +56,16 @@ class SILVTable : public llvm::ilist_node<SILVTable>,
     };
 
     Entry()
-      : Implementation(nullptr), TheKind(Kind::Normal) { }
+      : Implementation(nullptr),
+        TheKind(Kind::Normal),
+        Linkage(SILLinkage::Private) { }
 
-    Entry(SILDeclRef Method, SILFunction *Implementation, Kind TheKind)
-      : Method(Method), Implementation(Implementation), TheKind(TheKind) { }
+    Entry(SILDeclRef Method, SILFunction *Implementation,
+          Kind TheKind, SILLinkage Linkage)
+      : Method(Method),
+        Implementation(Implementation),
+        TheKind(TheKind),
+        Linkage(Linkage) { }
 
     /// The declaration reference to the least-derived method visible through
     /// the class.
@@ -75,6 +76,14 @@ class SILVTable : public llvm::ilist_node<SILVTable>,
 
     /// The entry kind.
     Kind TheKind;
+
+    /// The linkage of the implementing function.
+    ///
+    /// This is usually the same as
+    ///   stripExternalFromLinkage(Implementation->getLinkage())
+    /// except if Implementation is a thunk (which has private or shared
+    /// linkage).
+    SILLinkage Linkage;
   };
 
   // Disallow copying into temporary objects.

branches/rxwei-patch-1/include/swift/Serialization/ModuleFormat.h

@@ -52,7 +52,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 494; // remove linkage from SILVTable
+const uint16_t SWIFTMODULE_VERSION_MINOR = 493; // dependency types for structs
 
 using DeclIDField = BCFixed<31>;
 

branches/rxwei-patch-1/lib/AST/ASTContext.cpp

@@ -4189,10 +4189,6 @@ bool ASTContext::isTypeBridgedInExternalModule(
           nominal == getFloatDecl() ||
           nominal == getDoubleDecl() ||
           nominal == getArrayDecl() ||
-          nominal == getCollectionDifferenceDecl() ||
-          (nominal->getDeclContext()->getAsDecl() ==
-            getCollectionDifferenceDecl() &&
-            nominal->getBaseName() == Id_Change) ||
           nominal == getDictionaryDecl() ||
           nominal == getSetDecl() ||
           nominal == getStringDecl() ||

branches/rxwei-patch-1/lib/AST/ASTDumper.cpp

@@ -1967,8 +1967,6 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
   void visitObjectLiteralExpr(ObjectLiteralExpr *E) {
     printCommon(E, "object_literal") 
       << " kind='" << E->getLiteralKindPlainName() << "'";
-    PrintWithColorRAII(OS, LiteralValueColor) << " initializer=";
-    E->getInitializer().dump(PrintWithColorRAII(OS, LiteralValueColor).getOS());
     printArgumentLabels(E->getArgumentLabels());
     OS << "\n";
     printRec(E->getArg());

branches/rxwei-patch-1/lib/AST/Decl.cpp

@@ -531,17 +531,6 @@ bool AbstractFunctionDecl::isTransparent() const {
   return false;
 }
 
-bool ParameterList::hasInternalParameter(StringRef Prefix) const {
-  for (auto param : *this) {
-    if (param->hasName() && param->getNameStr().startswith(Prefix))
-      return true;
-    auto argName = param->getArgumentName();
-    if (!argName.empty() && argName.str().startswith(Prefix))
-      return true;
-  }
-  return false;
-}
-
 bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {
   const Decl *D = this;
   if (auto ExtD = dyn_cast<ExtensionDecl>(D)) {
@@ -563,15 +552,26 @@ bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {
       FU->getKind() != FileUnitKind::SerializedAST)
     return false;
 
+  auto hasInternalParameter = [](const ParameterList *params) -> bool {
+    for (auto param : *params) {
+      if (param->hasName() && param->getNameStr().startswith("_"))
+        return true;
+      auto argName = param->getArgumentName();
+      if (!argName.empty() && argName.str().startswith("_"))
+        return true;
+    }
+    return false;
+  };
+
   if (auto AFD = dyn_cast<AbstractFunctionDecl>(D)) {
     // If it's a function with a parameter with leading underscore, it's a
     // private function.
-    if (AFD->getParameters()->hasInternalParameter("_"))
+    if (hasInternalParameter(AFD->getParameters()))
       return true;
   }
 
   if (auto SubscriptD = dyn_cast<SubscriptDecl>(D)) {
-    if (SubscriptD->getIndices()->hasInternalParameter("_"))
+    if (hasInternalParameter(SubscriptD->getIndices()))
       return true;
   }
 
@@ -3691,7 +3691,6 @@ ClassDecl::ClassDecl(SourceLoc ClassLoc, Identifier Name, SourceLoc NameLoc,
   Bits.ClassDecl.AncestryComputed = 0;
   Bits.ClassDecl.HasMissingDesignatedInitializers = 0;
   Bits.ClassDecl.HasMissingVTableEntries = 0;
-  Bits.ClassDecl.IsIncompatibleWithWeakReferences = 0;
 }
 
 bool ClassDecl::hasResilientMetadata() const {
@@ -3775,16 +3774,6 @@ bool ClassDecl::hasMissingVTableEntries() const {
   return Bits.ClassDecl.HasMissingVTableEntries;
 }
 
-bool ClassDecl::isIncompatibleWithWeakReferences() const {
-  if (Bits.ClassDecl.IsIncompatibleWithWeakReferences) {
-    return true;
-  }
-  if (auto superclass = getSuperclassDecl()) {
-    return superclass->isIncompatibleWithWeakReferences();
-  }
-  return false;
-}
-
 bool ClassDecl::inheritsSuperclassInitializers(LazyResolver *resolver) {
   // Check whether we already have a cached answer.
   if (addedImplicitInitializers())
@@ -5444,6 +5433,9 @@ PropertyWrapperTypeInfo VarDecl::getAttachedPropertyWrapperTypeInfo() const {
 
 Type VarDecl::getAttachedPropertyWrapperType() const {
   auto &ctx = getASTContext();
+  if (!ctx.getLazyResolver())
+    return nullptr;
+
   auto mutableThis = const_cast<VarDecl *>(this);
   return evaluateOrDefault(ctx.evaluator,
                            AttachedPropertyWrapperTypeRequest{mutableThis},
@@ -5452,6 +5444,9 @@ Type VarDecl::getAttachedPropertyWrapperType() const {
 
 Type VarDecl::getPropertyWrapperBackingPropertyType() const {
   ASTContext &ctx = getASTContext();
+  if (!ctx.getLazyResolver())
+    return nullptr;
+
   auto mutableThis = const_cast<VarDecl *>(this);
   return evaluateOrDefault(
       ctx.evaluator, PropertyWrapperBackingPropertyTypeRequest{mutableThis},
@@ -5461,6 +5456,9 @@ Type VarDecl::getPropertyWrapperBackingPropertyType() const {
 PropertyWrapperBackingPropertyInfo
 VarDecl::getPropertyWrapperBackingPropertyInfo() const {
   auto &ctx = getASTContext();
+  if (!ctx.getLazyResolver())
+    return PropertyWrapperBackingPropertyInfo();
+
   auto mutableThis = const_cast<VarDecl *>(this);
   return evaluateOrDefault(
       ctx.evaluator,

branches/rxwei-patch-1/lib/AST/ProtocolConformance.cpp

@@ -966,23 +966,8 @@ Witness SelfProtocolConformance::getWitness(ValueDecl *requirement,
 ConcreteDeclRef
 RootProtocolConformance::getWitnessDeclRef(ValueDecl *requirement,
                                            LazyResolver *resolver) const {
-  if (auto witness = getWitness(requirement, resolver)) {
-    auto *witnessDecl = witness.getDecl();
-
-    // If the witness is generic, you have to call getWitness() and build
-    // your own substitutions in terms of the synthetic environment.
-    if (auto *witnessDC = dyn_cast<DeclContext>(witnessDecl))
-      assert(!witnessDC->isInnermostContextGeneric());
-
-    // If the witness is not generic, use type substitutions from the
-    // witness's parent. Don't use witness.getSubstitutions(), which
-    // are written in terms of the synthetic environment.
-    auto subs =
-      getType()->getContextSubstitutionMap(getDeclContext()->getParentModule(),
-                                           witnessDecl->getDeclContext());
-    return ConcreteDeclRef(witness.getDecl(), subs);
-  }
-
+  if (auto witness = getWitness(requirement, resolver))
+    return witness.getDeclRef();
   return ConcreteDeclRef();
 }
 
@@ -1135,6 +1120,11 @@ SpecializedProtocolConformance::getWitnessDeclRef(
   auto witnessMap = baseWitness.getSubstitutions();
 
   auto combinedMap = witnessMap.subst(specializationMap);
+
+  // Fast path if the substitutions didn't change.
+  if (combinedMap == baseWitness.getSubstitutions())
+    return baseWitness;
+
   return ConcreteDeclRef(witnessDecl, combinedMap);
 }
 

branches/rxwei-patch-1/lib/AST/TypeCheckRequests.cpp

@@ -648,7 +648,6 @@ void PropertyWrapperBackingPropertyTypeRequest::noteCycleStep(
     DiagnosticEngine &diags) const {
   std::get<0>(getStorage())->diagnose(diag::circular_reference_through);
 }
-
 bool PropertyWrapperBackingPropertyInfoRequest::isCached() const {
   auto var = std::get<0>(getStorage());
   return !var->getAttrs().isEmpty();

branches/rxwei-patch-1/lib/ClangImporter/ImportDecl.cpp

@@ -4692,9 +4692,6 @@ namespace {
   }
 #include "InferredAttributes.def"
 
-      if (decl->isArcWeakrefUnavailable())
-        result->setIsIncompatibleWithWeakReferences();
-
       result->setMemberLoader(&Impl, 0);
       result->addImplicitDestructor();
 

branches/rxwei-patch-1/lib/IDE/Formatting.cpp

@@ -481,25 +481,6 @@ class FormatContext {
       }
     }
 
-    // Chained trailing closures shouldn't require additional indentation.
-    // a.map {
-    //  ...
-    // }.filter { <--- No indentation here.
-    //  ...
-    // }.map { <--- No indentation here.
-    //  ...
-    // }
-    if (AtExprEnd && AtCursorExpr &&
-        (isa<CallExpr>(AtExprEnd) || isa<SubscriptExpr>(AtExprEnd))) {
-      if (auto *UDE = dyn_cast<UnresolvedDotExpr>(AtCursorExpr)) {
-        if (auto *Base = UDE->getBase()) {
-          if (exprEndAtLine(Base, Line))
-            return false;
-        }
-      }
-    }
-
-
     // Indent another level from the outer context by default.
     return true;
   }