From 2b550b7dbbfde803f68d7dc36824e58abde4996a Mon Sep 17 00:00:00 2001
From: Doug Gregor <dgregor@apple.com>
Date: Thu, 27 May 2021 21:06:41 -0700
Subject: [PATCH 1/2] Fix ChangeLog entry for SE-0313

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cefabb15c35a2..5dd9a3cc5d5e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ Swift 5.5
   ```swift
   actor Account: Hashable {
     let idNumber: Int
-    let balance: Double
+    var balance: Double
 
     nonisolated func hash(into hasher: inout Hasher) { // okay, non-isolated satisfies synchronous requirement
       hasher.combine(idNumber) // okay, can reference idNumber from outside the let

From da880d9c865a93228f8b1b29538712762868d453 Mon Sep 17 00:00:00 2001
From: Dario Rexin <dario.rexin@me.com>
Date: Thu, 27 May 2021 22:34:24 -0700
Subject: [PATCH 2/2] [Build] Pass '--reconfigure' to build-script-impl
 (#37677)

We recently started using the flag in build-script and forgot to pass it on the build-script-impl

rdar://78578996
---
 utils/build-script                                         | 3 +++
 .../reconfigure-passed-to-build-script-impl.test           | 7 +++++++
 2 files changed, 10 insertions(+)
 create mode 100644 validation-test/BuildSystem/reconfigure-passed-to-build-script-impl.test

diff --git a/utils/build-script b/utils/build-script
index 9463d553f0a9a..96983725aa100 100755
--- a/utils/build-script
+++ b/utils/build-script
@@ -778,6 +778,9 @@ class BuildScriptInvocation(object):
         if args.dry_run:
             impl_args += ["--dry-run"]
 
+        if args.reconfigure:
+            impl_args += ["--reconfigure"]
+
         if args.clang_profile_instr_use:
             impl_args += [
                 "--clang-profile-instr-use=%s" %
diff --git a/validation-test/BuildSystem/reconfigure-passed-to-build-script-impl.test b/validation-test/BuildSystem/reconfigure-passed-to-build-script-impl.test
new file mode 100644
index 0000000000000..dfe8c24e5533a
--- /dev/null
+++ b/validation-test/BuildSystem/reconfigure-passed-to-build-script-impl.test
@@ -0,0 +1,7 @@
+# RUN: %empty-directory(%t)
+# RUN: mkdir -p %t
+# RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --reconfigure --verbose 2>&1| %FileCheck %s
+
+# REQUIRES: standalone_build
+
+# CHECK: build-script-impl{{.*}} --reconfigure