---

bob-wilson · bob-wilson · commit d42446bf58cd · 2018-11-29T12:56:14.000-08:00
yaml --- r: 346063 b: refs/heads/master c: fa5ee3d h: refs/heads/master i: 346061: 687b7dc 346059: 0854669 346055: f339b4b 346047: 5e38dee
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9929c5b31530d34adc9f5469d16ef570221810bd
+refs/heads/master: fa5ee3d717ef1fff0abc03506b5c6aa6e28bc0ac
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
diff --git a/trunk/benchmark/single-source/DictTest4Legacy.swift b/trunk/benchmark/single-source/DictTest4Legacy.swift
@@ -56,10 +56,6 @@ struct LargeKey: Hashable {
     return hash
   }
 
-  func hash(into hasher: inout Hasher) {
-    hasher.combine(self.hashValue)
-  }
-
   init(_ value: Int) {
     self.i = value
     self.j = 2 * value
diff --git a/trunk/docs/WindowsBuild.md b/trunk/docs/WindowsBuild.md
@@ -17,16 +17,29 @@ the other hand, `clang-cl` is able to build the runtime, which makes it
 possible to build and run all the components required for Swift natively on
 Windows.
 
-clang should be 7.0 or newer.  Visual Studio 2017 is needed in all cases as
-it provides some of the needed headers and libraries.
-
 ## `clang-cl`
+- Windows doesn't currently have a build script. You'll need to run commands
+  manually to build Swift on Windows.
+- Windows support for Swift is a work in progress and may not work on your
+  system, but it has been tested.
+- Using the latest Visual Studio version is recommended (tested with Visual
+  Studio 2017 - Version 15.5.5). Swift may fail to build with older C++ 
+  compilers.
+- Note that the release version of Swift on Windows may crash when you try to compile a 
+  Swift program. See bug report [SR-7867](https://bugs.swift.org/browse/SR-7867).
 
 ### 1. Install dependencies
-1. Latest version of [Visual Studio](https://www.visualstudio.com/downloads/)
+1. Latest version (2.7.12 tested) of [Python
+   2](https://www.python.org/downloads/)
+1. Latest version (3.7.0-rc3 tested) of [CMake](https://cmake.org/download/)
+1. Latest version (1.7.1 tested) of
+   [Ninja](https://github.com/ninja-build/ninja/releases/latest)
+1. Latest version (2015 Update 3 tested) of [Visual
+   Studio](https://www.visualstudio.com/downloads/)
 - Make sure to include "Programming Languages|Visual C++" and "Windows and Web
   Development|Universal Windows App Development|Windows SDK" in your
   installation.
+- Make sure to add Python, CMake and Ninja to your `Path` environment variable
 
 ### 2. Clone the repositories
 1. Create a folder to contain all the Swift repositories
@@ -35,7 +48,6 @@ it provides some of the needed headers and libraries.
 1. Clone `apple/swift-llvm` into a folder named `llvm`
 1. Clone `apple/swift-compiler-rt` into a folder named `compiler-rt`
 1. Clone `apple/swift` into a folder named `swift`
-1. Clone `apple/swift-corelibs-libdispatch` into a folder named `swift-corelibs-libdispatch`
 - Currently, other repositories in the Swift project have not been tested and
   may not be supported.
 
@@ -77,9 +89,11 @@ set swift_source_dir=path-to-directory-containing-all-cloned-repositories
   (`Debug`, `RelWithDebInfoAssert` or `Release`) to avoid conflicts between the debug and 
   non-debug version of the MSCRT library.
 
-- Set up the `ucrt`, `visualc`, and `WinSDK` modules by copying  `ucrt.modulemap` located at
+- Set up the `visualc` and `ucrt` modules by copying  `ucrt.modulemap` located at
   `swift/stdlib/public/Platform/ucrt.modulemap` into
-  `${UniversalCRTSdkDir}/Include/${UCRTVersion}/ucrt` as `module.modulemap`, copying `visualc.modulemap` located at `swift/stdlib/public/Platform/visualc.modulemap` into `${VCToolsInstallDir}/include` as `module.modulemap`, and copying `winsdk.modulemap` located at `swift/stdlib/public/Platform/winsdk.modulemap` into `${UniversalCRTSdkDir}/Include/10.0.107663/um`
+  `${UniversalCRTSdkDir}/Include/${UCRTVersion}/ucrt` as `module.modulemap` and copying `visualc.modulemap` located at `swift/stdlib/public/Platform/visualc.modulemap` into `${VCToolsInstallDir}/include` as `module.modulemap`
+
+
 
 ### 5. Build CMark
 - This must be done from within a developer command prompt. CMark is a fairly
@@ -129,7 +143,7 @@ set llvm_bin_dir="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64/
 ```cmd
 mkdir "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
 pushd "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
-cmake -G "Ninja"^
+cmake -G "Ninja" "%swift_source_dir%/swift"^
  -DCMAKE_BUILD_TYPE=Debug^
  -DSWIFT_PATH_TO_CMARK_SOURCE="%swift_source_dir%/cmark"^
  -DSWIFT_PATH_TO_CMARK_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/cmark-windows-amd64"^
@@ -138,22 +152,24 @@ cmake -G "Ninja"^
  -DSWIFT_PATH_TO_LLVM_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
  -DSWIFT_PATH_TO_CLANG_SOURCE="%swift_source_dir%/llvm/tools/clang"^
  -DSWIFT_PATH_TO_CLANG_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
- -DICU_WINDOWS_x86_64_UC_INCLUDE="%swift_source_dir%/icu/include"^
- -DICU_WINDOWS_x86_64_UC_LIBRARY="%swift_source_dir%/icu/lib64/icuuc.lib"^
- -DICU_WINDOWS_x86_64_I18N_INCLUDE="%swift_source_dir%/icu/include"^
- -DICU_WINDOWS_x86_64_I18N_LIBRARY="%swift_source_dir%/icu/lib64/icuin.lib"^
+ -DICU_UC_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
+ -DICU_UC_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
+ -DICU_I18N_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
+ -DICU_I18N_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
+ -DICU_UC_LIB_NAME="icuuc"^
+ -DICU_I18N_LIB_NAME="icuin"^
  -DSWIFT_INCLUDE_DOCS=FALSE^
  -DSWIFT_INCLUDE_TESTS=FALSE^
  -DCMAKE_C_COMPILER="%llvm_bin_dir%/clang-cl.exe"^
  -DCMAKE_CXX_COMPILER="%llvm_bin_dir%/clang-cl.exe"^
- -DCMAKE_C_FLAGS="/Z7"^
- -DCMAKE_CXX_FLAGS="/Z7 -Wno-c++98-compat -Wno-c++98-compat-pedantic"^
+ -DCMAKE_C_FLAGS="-fms-compatibility-version=19.00 /Z7"^
+ -DCMAKE_CXX_FLAGS="-fms-compatibility-version=19.00 -Z7"^
  -DCMAKE_EXE_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
  -DCMAKE_MODULE_LINKER_FLAGS="/INCREMENTAL:NO"^
  -DCMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO"^
  -DCMAKE_STATIC_LINKER_FLAGS="/INCREMENTAL:NO"^
  -DCMAKE_INSTALL_PREFIX="C:/Program Files (x86)/Swift"^
-  "%swift_source_dir%/swift"
+ -DSWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER=FALSE
 popd
 cmake --build "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
 ```
@@ -166,7 +182,7 @@ cmake --build "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
   a file.
 
 ```cmd
-cmake -G "Visual Studio 2017" "%swift_source_dir%/swift"^
+cmake -G "Visual Studio 15" "%swift_source_dir%/swift"^
  -DCMAKE_GENERATOR_PLATFORM="x64"^
  ...
 ```
@@ -189,8 +205,8 @@ cmake -G "Ninja" "%swift_source_dir%/lldb"^
   -DLLDB_PATH_TO_SWIFT_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"^
   -DCMAKE_C_COMPILER="%llvm_bin_dir%/clang-cl.exe"^
   -DCMAKE_CXX_COMPILER="%llvm_bin_dir%/clang-cl.exe"^
-  -DCMAKE_C_FLAGS="/Z7"^
-  -DCMAKE_CXX_FLAGS="/Z7 -Wno-c++98-compat"^
+  -DCMAKE_C_FLAGS="-fms-compatibility-version=19.00 /Z7"^
+  -DCMAKE_CXX_FLAGS="-fms-compatibility-version=19.00 -Z7 -Wno-c++98-compat"^
   -DLLVM_ENABLE_ASSERTIONS=YES
 popd
 cmake --build "%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/lldb-windows-amd64"
@@ -216,7 +232,7 @@ Follow instructions 1-6 for `clang-cl`, but run the following instead to build S
 ```cmd
 mkdir "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
 pushd "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
-cmake -G "Ninja"^
+cmake -G "Ninja" "%swift_source_dir%/swift"^
  -DCMAKE_BUILD_TYPE=Debug^
  -DSWIFT_PATH_TO_CMARK_SOURCE="%swift_source_dir%/cmark"^
  -DSWIFT_PATH_TO_CMARK_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/cmark-windows-amd64"^
@@ -225,15 +241,16 @@ cmake -G "Ninja"^
  -DSWIFT_PATH_TO_LLVM_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
  -DSWIFT_PATH_TO_CLANG_SOURCE="%swift_source_dir%/llvm/tools/clang"^
  -DSWIFT_PATH_TO_CLANG_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
- -DICU_WINDOWS_x86_64_UC_INCLUDE="%swift_source_dir%/icu/include"^
- -DICU_WINDOWS_x86_64_UC_LIBRARY="%swift_source_dir%/icu/lib64/icuuc.lib"^
- -DICU_WINDOWS_x86_64_I18N_INCLUDE="%swift_source_dir%/icu/include"^
- -DICU_WINDOWS_x86_64_I18N_LIBRARY="%swift_source_dir%/icu/lib64/icuin.lib"^
+ -DICU_UC_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
+ -DICU_UC_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
+ -DICU_I18N_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
+ -DICU_I18N_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
+ -DICU_UC_LIB_NAME="icuuc"^
+ -DICU_I18N_LIB_NAME="icuin"^
  -DSWIFT_INCLUDE_DOCS=FALSE^
  -DSWIFT_INCLUDE_TESTS=FALSE^
  -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=FALSE^
- -DSWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER=FALSE^
-  "%swift_source_dir%/swift"
+ -DSWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER=FALSE
 popd
 cmake --build "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
 ```
diff --git a/trunk/include/swift/AST/DiagnosticsSema.def b/trunk/include/swift/AST/DiagnosticsSema.def
@@ -2944,11 +2944,8 @@ ERROR(closure_implicit_capture_without_noescape,none,
       "escaping closures can only capture inout parameters explicitly by value",
       ())
 ERROR(closure_implicit_capture_mutating_self,none,
-      "escaping closure cannot capture a mutating self parameter",
+      "closure cannot implicitly capture a mutating self parameter",
       ())
-NOTE(create_mutating_copy_or_capture_self,none,
-     "create a mutating copy of self, or explicitly capture self for immutability",
-     ())
 ERROR(nested_function_with_implicit_capture_argument,none,
       "nested function with %select{an |}0implicitly captured inout "
       "parameter%select{|s}0 can only be used as a non-escaping argument", (bool))
diff --git a/trunk/lib/Basic/Platform.cpp b/trunk/lib/Basic/Platform.cpp
@@ -139,6 +139,7 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
   case llvm::Triple::Contiki:
   case llvm::Triple::AMDPAL:
   case llvm::Triple::HermitCore:
+  case llvm::Triple::Hurd:
     return "";
   case llvm::Triple::Darwin:
   case llvm::Triple::MacOSX:
diff --git a/trunk/lib/Sema/TypeCheckCaptures.cpp b/trunk/lib/Sema/TypeCheckCaptures.cpp
@@ -402,9 +402,7 @@ class FindCapturedVars : public ASTWalker {
     if (isInOut && !AFR.isKnownNoEscape() && !isNested) {
       if (D->getBaseName() == D->getASTContext().Id_self) {
         TC.diagnose(DRE->getLoc(),
-                    diag::closure_implicit_capture_mutating_self);
-        TC.diagnose(DRE->getLoc(),
-                    diag::create_mutating_copy_or_capture_self);
+          diag::closure_implicit_capture_mutating_self);
       } else {
         TC.diagnose(DRE->getLoc(),
           diag::closure_implicit_capture_without_noescape);
diff --git a/trunk/stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb b/trunk/stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb
@@ -93,10 +93,6 @@ SWIFT_RUNTIME_STDLIB_API
   return swift_tryRetain(reinterpret_cast<HeapObject*>(self)) != nullptr;
 }
 
-+ (BOOL)automaticallyNotifiesObserversForKey:(NSString *)key {
-  return NO;
-}
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
 - (void)dealloc {
diff --git a/trunk/test/Sema/diag_invalid_inout_captures.swift b/trunk/test/Sema/diag_invalid_inout_captures.swift
@@ -6,8 +6,7 @@ func do_escape(_ not_a_price_you_are_willing_to_pay: @escaping () -> ()) {}
 struct you_cry_in_your_tea {
   mutating func which_you_hurl_in_the_sea_when_you_see_me_go_by() {
     no_escape { _ = self } // OK
-    do_escape { _ = self } // expected-error {{escaping closure cannot capture a mutating self parameter}}
-    // expected-note@-1 {{create a mutating copy of self, or explicitly capture self for immutability}}
+    do_escape { _ = self } // expected-error {{closure cannot implicitly capture a mutating self parameter}}
     do_escape {
       [self] in
       _ = self // OK
@@ -41,23 +40,3 @@ func remember(line: inout String) -> () -> Void {
 func its_complicated(condition: inout Int) {
   no_escape(condition == 0 ? { condition = 1 } : { condition = 2}) // expected-error 2 {{escaping closures can only capture inout parameters explicitly by value}}
 }
-
-// rdar://problem/46322943 - Improve error message about mutating self capture in escaping closures
-func rdar46322943() {
-  struct S {
-    var bar = 1
-
-    func foo(_ fn: () -> Void) {
-      fn()
-    }
-
-    mutating func main() {
-      let fn = {
-        self.bar += 1
-        // expected-error@-1 {{escaping closure cannot capture a mutating self parameter}}
-        // expected-note@-2 {{create a mutating copy of self, or explicitly capture self for immutability}}
-      }
-      self.foo(fn)
-    }
-  }
-}
diff --git a/trunk/test/stdlib/Metal.swift b/trunk/test/stdlib/Metal.swift
@@ -259,12 +259,10 @@ if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *){
       let encoder = cmdBuf.makeRenderCommandEncoder(descriptor: rpDesc)!
       encoder.useResources([buf], usage: MTLResourceUsage.read)
       encoder.useHeaps([heap])
-#if os(macOS) || os(iOS)
-      if #available(iOS 12.0, macOS 10.13, *) {
+      #if os(macOS)
         encoder.setViewports([MTLViewport()])
         encoder.setScissorRects([MTLScissorRect(x:0, y:0, width:1, height:1)])
-      }
-#endif
+      #endif
       encoder.setVertexBuffers([buf], offsets: [0], range: 0..<1)
       encoder.setVertexTextures([tex], range: 0..<1)
       encoder.setVertexSamplerStates([smplr], range: 0..<1)
