[pull] katei/swiftwasm from swiftwasm

CHANGELOG.md

@@ -23,6 +23,33 @@ CHANGELOG
 
 </details>
 
+Swift Next
+----------
+
+* [SE-0269][]:
+
+  When an escaping closure explicitly captures `self` in its capture list, the
+  use of implicit `self` is enabled within that closure. This means that the
+  following code is now valid:
+
+  ```swift
+  func doStuff(_ stuff: @escaping () -> Void) {}
+
+  class C {
+      var x = 0
+
+      func method() {
+          doStuff { [self] in
+              x += 1
+          }
+      }
+  }
+  ```
+
+  This proposal also introduces new diagnostics for inserting `self` into the
+  closure's capture list in addition to the existing 'use `self.` explicitly'
+  fix-it.
+
 Swift 5.2
 ---------
 
@@ -7856,6 +7883,7 @@ Swift 1.0
 [SE-0252]: <https://github.com/apple/swift-evolution/blob/master/proposals/0252-keypath-dynamic-member-lookup.md>
 [SE-0253]: <https://github.com/apple/swift-evolution/blob/master/proposals/0253-callable.md>
 [SE-0254]: <https://github.com/apple/swift-evolution/blob/master/proposals/0254-static-subscripts.md>
+[SE-0269]: <https://github.com/apple/swift-evolution/blob/master/proposals/0269-implicit-self-explicit-capture.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
 [SR-419]: <https://bugs.swift.org/browse/SR-419>

cmake/modules/FindLibEdit.cmake

@@ -59,6 +59,12 @@ else()
                                       LibEdit_LIBRARIES
                                     VERSION_VAR
                                       LibEdit_VERSION_STRING)
-  mark_as_advanced(LibEdit_INCLUDE_DIRS LibEdit_LIBRARIES)
 endif()
 
+if(LibEdit_FOUND AND NOT TARGET libedit)
+  add_library(libedit UNKNOWN IMPORTED)
+  set_target_properties(libedit PROPERTIES
+    IMPORTED_LOCATION ${LibEdit_LIBRARIES}
+    INTERFACE_INCLUDE_DIRECTORIES ${LibEdit_INCLUDE_DIRS})
+endif()
+mark_as_advanced(LibEdit_INCLUDE_DIRS LibEdit_LIBRARIES)

include/swift/AST/ASTContext.h

@@ -631,6 +631,10 @@ class ASTContext final {
   /// compiler for the target platform.
   AvailabilityContext getSwift52Availability();
 
+  /// Get the runtime availability of features that have been introduced in the
+  /// Swift compiler for future versions of the target platform.
+  AvailabilityContext getSwiftFutureAvailability();
+
 
   //===--------------------------------------------------------------------===//
   // Diagnostics Helper functions