---

yaml
---
r: 314295
b: refs/heads/rxwei-patch-6
c: 1a92886
h: refs/heads/master
i:
  314293: 92ed1d3
  314291: 65042bb
  314287: a642b3d

Author: gmittert

[refs]

@@ -1422,7 +1422,7 @@ refs/heads/remove-AlignedCharArray: a09ee8660ce66898d5a5a04e2adb4a5ecf1c4644
 refs/heads/revert-25193-gsoc-2019-parser: c66a8be4eb8cea9e606bcbfce52820ad02f23413
 refs/heads/revert-25911-revert-25766-reenable-test-tsan-norace-deinit: 0f330b25b83d3c83ce993f535d4a83bb626aafa3
 refs/heads/revert-26183-rename-adjoint-to-pullback: b16bd9f4bc54ae8ec31f412ac542dcf6f522d9ee
-refs/heads/rxwei-patch-6: 184d942ba00a230e471553ff494f9e9553e40b1f
+refs/heads/rxwei-patch-6: 1a9288694dfb9c4ddf4f95c0e0c0e91d651117cb
 refs/heads/shahmishal-patch-3: f3e0bc73927d564bb35354dc6473a1981f2a864e
 refs/heads/shahmishal/pr-swiftsyntax-test: 64ff140a6dfa78ecea27eeb6d29582650198f3e0
 refs/heads/test-libdispatch-preset-on-swift-5.1-branch: 2ab0acdec00ee31d21490154081c3001648a8b85

branches/rxwei-patch-6/benchmark/CMakeLists.txt

@@ -166,6 +166,7 @@ set(SWIFT_BENCH_MODULES
     single-source/StringInterpolation
     single-source/StringMatch
     single-source/StringRemoveDupes
+    single-source/StringReplaceSubrange
     single-source/StringTests
     single-source/StringWalk
     single-source/Substring

branches/rxwei-patch-6/benchmark/single-source/StringReplaceSubrange.swift

@@ -0,0 +1,75 @@
+//===--- StringReplaceSubrange.swift -------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+
+let tags: [BenchmarkCategory] = [.validation, .api, .String]
+
+public let StringReplaceSubrange = [
+  BenchmarkInfo(
+    name: "String.replaceSubrange.String.Small",
+    runFunction: { replaceSubrange($0, smallString, with: "t") },
+    tags: tags
+  ),
+  BenchmarkInfo(
+    name: "String.replaceSubrange.String",
+    runFunction: { replaceSubrange($0, largeString, with: "t") },
+    tags: tags
+  ),
+  BenchmarkInfo(
+    name: "String.replaceSubrange.Substring.Small",
+    runFunction: { replaceSubrange($0, smallString, with: "t"[...]) },
+    tags: tags
+  ),
+  BenchmarkInfo(
+    name: "String.replaceSubrange.Substring",
+    runFunction: { replaceSubrange($0, largeString, with: "t"[...]) },
+    tags: tags
+  ),
+  BenchmarkInfo(
+    name: "String.replaceSubrange.ArrChar.Small",
+    runFunction: { replaceSubrange($0, smallString, with: arrayCharacter) },
+    tags: tags
+  ),
+  BenchmarkInfo(
+    name: "String.replaceSubrange.ArrChar",
+    runFunction: { replaceSubrange($0, largeString, with: arrayCharacter) },
+    tags: tags
+  ),
+  BenchmarkInfo(
+    name: "String.replaceSubrange.RepChar.Small",
+    runFunction: { replaceSubrange($0, smallString, with: repeatedCharacter) },
+    tags: tags
+  ),
+  BenchmarkInfo(
+    name: "String.replaceSubrange.RepChar",
+    runFunction: { replaceSubrange($0, largeString, with: repeatedCharacter) },
+    tags: tags
+  ),
+]
+
+let smallString = "coffee"
+let largeString = "coffee\u{301}coffeecoffeecoffeecoffee"
+
+let arrayCharacter = Array<Character>(["t"])
+let repeatedCharacter = repeatElement(Character("t"), count: 1)
+
+@inline(never)
+private func replaceSubrange<C: Collection>(
+  _ N: Int, _ string: String, with newElements: C
+) where C.Element == Character {
+    var copy = getString(string)
+    let range = string.startIndex..<string.index(after: string.startIndex)
+    for _ in 0 ..< 500 * N {
+      copy.replaceSubrange(range, with: newElements)
+    }
+}

branches/rxwei-patch-6/benchmark/utils/main.swift

@@ -161,6 +161,7 @@ import StringEnum
 import StringInterpolation
 import StringMatch
 import StringRemoveDupes
+import StringReplaceSubrange
 import StringTests
 import StringWalk
 import Substring
@@ -343,6 +344,7 @@ registerBenchmark(StringInterpolationManySmallSegments)
 registerBenchmark(StringMatch)
 registerBenchmark(StringNormalization)
 registerBenchmark(StringRemoveDupes)
+registerBenchmark(StringReplaceSubrange)
 registerBenchmark(StringTests)
 registerBenchmark(StringWalk)
 registerBenchmark(SubstringTest)

branches/rxwei-patch-6/include/swift/AST/ASTTypeIDZone.def

@@ -24,6 +24,7 @@ SWIFT_TYPEID(TypePair)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
 SWIFT_TYPEID(PropertyWrapperTypeInfo)
 SWIFT_TYPEID(CtorInitializerKind)
+SWIFT_TYPEID(ResilienceExpansion)
 SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>, PropertyWrapperMutability)
 SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
 SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)

branches/rxwei-patch-6/include/swift/AST/TypeCheckRequests.h

@@ -662,6 +662,29 @@ class StructuralTypeRequest :
   bool isCached() const { return true; }
 };
 
+/// Request the most optimal resilience expansion for the code in the context.
+class ResilienceExpansionRequest :
+    public SimpleRequest<ResilienceExpansionRequest,
+                         ResilienceExpansion(DeclContext*),
+                         CacheKind::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<ResilienceExpansion> evaluate(Evaluator &eval,
+                                               DeclContext *context) const;
+
+public:
+  // Caching.
+  bool isCached() const { return true; }
+};
+
+void simple_display(llvm::raw_ostream &out,
+                    const ResilienceExpansion &value);
+
 /// Request the custom attribute which attaches a function builder to the
 /// given declaration.
 class AttachedFunctionBuilderRequest :

branches/rxwei-patch-6/include/swift/AST/TypeCheckerTypeIDZone.def

@@ -30,6 +30,7 @@ SWIFT_TYPEID(RequirementSignatureRequest)
 SWIFT_TYPEID(DefaultDefinitionTypeRequest)
 SWIFT_TYPEID(USRGenerationRequest)
 SWIFT_TYPEID(StructuralTypeRequest)
+SWIFT_TYPEID(ResilienceExpansionRequest)
 SWIFT_TYPEID(DefaultTypeRequest)
 SWIFT_TYPEID(MangleLocalTypeDeclRequest)
 SWIFT_TYPEID(PropertyWrapperTypeInfoRequest)

branches/rxwei-patch-6/include/swift/Basic/Platform.h

@@ -46,6 +46,10 @@ namespace swift {
   /// Return true if the given triple represents any simulator.
   bool tripleIsAnySimulator(const llvm::Triple &triple);
 
+  /// Returns true if the given triple represents an OS that ships with
+  /// ABI-stable swift libraries (eg. in /usr/lib/swift).
+  bool tripleRequiresRPathForSwiftInOS(const llvm::Triple &triple);
+
   /// Returns the platform name for a given target triple.
   ///
   /// For example, the iOS simulator has the name "iphonesimulator", while real

branches/rxwei-patch-6/include/swift/Option/Options.td

@@ -502,6 +502,12 @@ def static_stdlib: Flag<["-"], "static-stdlib">,
 def no_static_stdlib: Flag<["-"], "no-static-stdlib">,
   Flags<[HelpHidden,DoesNotAffectIncrementalBuild]>,
   HelpText<"Don't statically link the Swift standard library">;
+def toolchain_stdlib_rpath: Flag<["-"], "toolchain-stdlib-rpath">,
+  Flags<[HelpHidden,DoesNotAffectIncrementalBuild]>,
+  HelpText<"Add an rpath entry for the toolchain's standard library, rather than the OS's">;
+def no_stdlib_rpath: Flag<["-"], "no-stdlib-rpath">,
+  Flags<[HelpHidden,DoesNotAffectIncrementalBuild]>,
+  HelpText<"Don't add any rpath entries.">;
 
 def static_executable : Flag<["-"], "static-executable">,
   HelpText<"Statically link the executable">;

branches/rxwei-patch-6/lib/AST/DeclContext.cpp

@@ -20,6 +20,7 @@
 #include "swift/AST/LazyResolver.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Types.h"
+#include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/Statistic.h"
 #include "llvm/ADT/DenseMap.h"
@@ -310,7 +311,16 @@ bool DeclContext::isGenericContext() const {
 /// domains, this ensures that only sufficiently-conservative access patterns
 /// are used.
 ResilienceExpansion DeclContext::getResilienceExpansion() const {
-  for (const auto *dc = getLocalContext(); dc && dc->isLocalContext();
+  auto &context = getASTContext();
+  return evaluateOrDefault(context.evaluator,
+                           ResilienceExpansionRequest { const_cast<DeclContext *>(this) },
+                           ResilienceExpansion::Minimal);
+}
+
+llvm::Expected<ResilienceExpansion>
+  swift::ResilienceExpansionRequest::evaluate(Evaluator &eval,
+                                              DeclContext *context) const {
+  for (const auto *dc = context->getLocalContext(); dc && dc->isLocalContext();
        dc = dc->getParent()) {
     // Default argument initializer contexts have their resilience expansion
     // set when they're type checked.

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

@@ -615,6 +615,11 @@ void swift::simple_display(llvm::raw_ostream &os, PropertyWrapperMutability m) {
   os << "getter " << names[m.Getter] << ", setter " << names[m.Setter];
 }
 
+void swift::simple_display(llvm::raw_ostream &out,
+                           const ResilienceExpansion &value) {
+  out << value;
+}
+
 //----------------------------------------------------------------------------//
 // FunctionBuilder-related requests.
 //----------------------------------------------------------------------------//

branches/rxwei-patch-6/lib/Basic/Platform.cpp

@@ -54,6 +54,24 @@ bool swift::tripleIsAnySimulator(const llvm::Triple &triple) {
     tripleIsAppleTVSimulator(triple);
 }
 
+
+bool swift::tripleRequiresRPathForSwiftInOS(const llvm::Triple &triple) {
+  if (triple.isMacOSX()) {
+    // macOS 10.14.4 contains a copy of Swift, but the linker will still use an
+    // rpath-based install name until 10.15.
+    return triple.isMacOSXVersionLT(10, 15);
+
+  } else if (triple.isiOS()) {
+    return triple.isOSVersionLT(12, 2);
+
+  } else if (triple.isWatchOS()) {
+    return triple.isOSVersionLT(5, 2);
+  }
+
+  // Other platforms don't have Swift installed as part of the OS by default.
+  return false;
+}
+
 DarwinPlatformKind swift::getDarwinPlatformKind(const llvm::Triple &triple) {
   if (triple.isiOS()) {
     if (triple.isTvOS()) {