---

yaml
---
r: 347108
b: refs/heads/master
c: deb8b66
h: refs/heads/master

Author: smeenai

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7faf2ece2b5ac434cf21a1a2d6e620cc947b2d8a
+refs/heads/master: deb8b6691e4c2fd660b4ef4a4bd9c6f728f70266
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/benchmark/CMakeLists.txt

@@ -77,6 +77,7 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionaryRemove
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
+    single-source/DoubleWidthDivision
     single-source/DropFirst
     single-source/DropLast
     single-source/DropWhile

trunk/benchmark/single-source/DoubleWidthDivision.swift

@@ -0,0 +1,63 @@
+//===--- DoubleWidthDivision.swift ----------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 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
+//
+//===----------------------------------------------------------------------===//
+
+// This test checks performance of division using DoubleWidth.
+
+// FIXME: This needs to be disabled with an #if because it runs into pathological
+// compile time and code size problems.
+// [SR-6947] DoubleWidth compile time.
+// import Foundation
+import TestsUtils
+
+public let DoubleWidthDivision = BenchmarkInfo(
+  name: "DoubleWidthDivision",
+  runFunction: disabled,
+  tags: [.validation, .algorithm]
+)
+public func disabled(_ N: Int) {}
+
+#if false
+
+private typealias Int128 = DoubleWidth<Int64>
+private typealias Int256 = DoubleWidth<Int128>
+private typealias Int512 = DoubleWidth<Int256>
+private typealias Int1024 = DoubleWidth<Int512>
+
+@inline(never)
+public func run_DoubleWidthDivision(_ N: Int) {
+  var sum = 0
+  for _ in 1...5*N {
+    let (q, r) =
+      (Int128(Int64.max) * 16)
+        .quotientAndRemainder(dividingBy: numericCast(getInt(16)))
+    sum += Int(q * r)
+
+    let (q1, r1) =
+      (40 as Int128).dividingFullWidth(
+        (high: numericCast(getInt(0)), low: numericCast(getInt(240))))
+    sum += Int(q1 * r1)
+
+    let x =
+      DoubleWidth<DoubleWidth<DoubleWidth<Int8>>>(
+        Int64.max / numericCast(getInt(4)))
+    let y = DoubleWidth<DoubleWidth<Int8>>(Int32.max)
+    let (q2, r2) = y.dividingFullWidth((x.high, x.low))
+    sum += Int(q2 - r2)
+
+    let xx = Int1024(x)
+    let yy = Int512(y)
+    let (q3, r3) = yy.dividingFullWidth((xx.high, xx.low))
+    sum -= Int(q3 - r3)
+  }
+  CheckResults(sum == 0)
+}
+#endif

trunk/benchmark/utils/main.swift

@@ -65,6 +65,7 @@ import DictionaryOfAnyHashableStrings
 import DictionaryRemove
 import DictionarySubscriptDefault
 import DictionarySwap
+import DoubleWidthDivision
 import DropFirst
 import DropLast
 import DropWhile
@@ -234,6 +235,7 @@ registerBenchmark(DictionaryOfAnyHashableStrings)
 registerBenchmark(DictionaryRemove)
 registerBenchmark(DictionarySubscriptDefault)
 registerBenchmark(DictionarySwap)
+registerBenchmark(DoubleWidthDivision)
 registerBenchmark(DropFirst)
 registerBenchmark(DropLast)
 registerBenchmark(DropWhile)

trunk/cmake/modules/SwiftSource.cmake

@@ -195,7 +195,6 @@ function(_compile_swift_files
 
   # Compute flags for the Swift compiler.
   set(swift_flags)
-  set(swift_module_flags)
 
   _add_variant_swift_compile_flags(
       "${SWIFTFILE_SDK}"
@@ -284,10 +283,17 @@ function(_compile_swift_files
 
   list(APPEND swift_flags ${SWIFTFILE_FLAGS})
 
-  set(dirs_to_create)
+  set(obj_dirs)
   foreach(output ${SWIFTFILE_OUTPUT})
     get_filename_component(objdir "${output}" PATH)
-    list(APPEND dirs_to_create "${objdir}")
+    list(APPEND obj_dirs "${objdir}")
+  endforeach()
+  list(REMOVE_DUPLICATES obj_dirs)
+
+  set(command_create_dirs)
+  foreach(objdir ${obj_dirs})
+    list(APPEND command_create_dirs
+      COMMAND "${CMAKE_COMMAND}" -E make_directory "${objdir}")
   endforeach()
 
   set(module_file)
@@ -310,8 +316,6 @@ function(_compile_swift_files
     if(SWIFTFILE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
       set(specific_module_dir "${module_base}.swiftmodule")
       set(module_base "${module_base}.swiftmodule/${SWIFTFILE_ARCHITECTURE}")
-    else()
-      set(specific_module_dir)
     endif()
     set(module_file "${module_base}.swiftmodule")
     set(module_doc_file "${module_base}.swiftdoc")
@@ -324,8 +328,16 @@ function(_compile_swift_files
 
     if(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES)
       set(interface_file "${module_base}.swiftinterface")
-      list(APPEND swift_module_flags
-           "-emit-parseable-module-interface-path" "${interface_file}")
+      list(APPEND swift_flags
+          "-emit-parseable-module-interface-path" "${interface_file}")
+    endif()
+
+    if(SWIFTFILE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
+      list(APPEND command_create_dirs
+          COMMAND "${CMAKE_COMMAND}" -E make_directory "${specific_module_dir}")
+    else()
+      list(APPEND command_create_dirs
+          COMMAND "${CMAKE_COMMAND}" -E make_directory "${module_dir}")
     endif()
 
     # If we have extra regexp flags, check if we match any of the regexps. If so
@@ -386,7 +398,7 @@ function(_compile_swift_files
   endif()
 
   if (SWIFT_REPORT_STATISTICS)
-    list(GET dirs_to_create 0 first_obj_dir)
+    list(GET obj_dirs 0 first_obj_dir)
     list(APPEND swift_flags "-stats-output-dir" ${first_obj_dir})
   endif()
 
@@ -421,12 +433,12 @@ function(_compile_swift_files
   endif()
 
   # First generate the obj dirs
-  list(REMOVE_DUPLICATES dirs_to_create)
   add_custom_command_target(
-      create_dirs_dependency_target
-      COMMAND "${CMAKE_COMMAND}" -E make_directory ${dirs_to_create}
-      OUTPUT ${dirs_to_create}
-      COMMENT "Generating dirs for ${first_output}")
+      obj_dirs_dependency_target
+      ${command_create_dirs}
+      COMMAND ""
+      OUTPUT ${obj_dirs}
+      COMMENT "Generating obj dirs for ${first_output}")
 
   # Then we can compile both the object files and the swiftmodule files
   # in parallel in this target for the object file, and ...
@@ -466,7 +478,7 @@ function(_compile_swift_files
         ${swift_compiler_tool_dep}
         ${file_path} ${source_files} ${SWIFTFILE_DEPENDS}
         ${swift_ide_test_dependency}
-        ${create_dirs_dependency_target}
+        ${obj_dirs_dependency_target}
         ${copy_legacy_layouts_dep}
       COMMENT "Compiling ${first_output}")
   set("${dependency_target_out_var_name}" "${dependency_target}" PARENT_SCOPE)
@@ -491,20 +503,17 @@ function(_compile_swift_files
         module_dependency_target
         COMMAND
           "${CMAKE_COMMAND}" "-E" "remove" "-f" ${module_outputs}
-        COMMAND
-          "${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir}
-          ${specific_module_dir}
         COMMAND
           "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "@${file_path}" --
           "${swift_compiler_tool}" "-emit-module" "-o" "${module_file}"
-          ${swift_flags} ${swift_module_flags} "@${file_path}"
+          ${swift_flags} "@${file_path}"
         ${command_touch_module_outputs}
         OUTPUT ${module_outputs}
         DEPENDS
           ${swift_compiler_tool_dep}
           ${source_files} ${SWIFTFILE_DEPENDS}
           ${swift_ide_test_dependency}
-          ${create_dirs_dependency_target}
+          ${obj_dirs_dependency_target}
         COMMENT "Generating ${module_file}")
     set("${dependency_module_target_out_var_name}" "${module_dependency_target}" PARENT_SCOPE)
 
@@ -520,7 +529,7 @@ function(_compile_swift_files
         DEPENDS
           ${swift_compiler_tool_dep}
           ${source_files} ${SWIFTFILE_DEPENDS}
-          ${create_dirs_dependency_target}
+          ${obj_dirs_dependency_target}
         COMMENT "Generating ${sib_file}"
         EXCLUDE_FROM_ALL)
     set("${dependency_sib_target_out_var_name}" "${sib_dependency_target}" PARENT_SCOPE)
@@ -536,7 +545,7 @@ function(_compile_swift_files
         DEPENDS
           ${swift_compiler_tool_dep}
           ${source_files} ${SWIFTFILE_DEPENDS}
-          ${create_dirs_dependency_target}
+          ${obj_dirs_dependency_target}
         COMMENT "Generating ${sibopt_file}"
         EXCLUDE_FROM_ALL)
     set("${dependency_sibopt_target_out_var_name}" "${sibopt_dependency_target}" PARENT_SCOPE)
@@ -553,7 +562,7 @@ function(_compile_swift_files
         DEPENDS
           ${swift_compiler_tool_dep}
           ${source_files} ${SWIFTFILE_DEPENDS}
-          ${create_dirs_dependency_target}
+          ${obj_dirs_dependency_target}
           COMMENT "Generating ${sibgen_file}"
           EXCLUDE_FROM_ALL)
     set("${dependency_sibgen_target_out_var_name}" "${sibgen_dependency_target}" PARENT_SCOPE)

trunk/docs/SIL.rst

@@ -4311,7 +4311,7 @@ open_existential_addr
   //   type P
   // $*@opened P must be a unique archetype that refers to an opened
   // existential type P.
-  // %1 will be of type $*@opened P
+  // %1 will be of type $*P
 
 Obtains the address of the concrete value inside the existential
 container referenced by ``%0``. The protocol conformances associated
@@ -4334,7 +4334,7 @@ open_existential_value
   //   type P
   // $@opened P must be a unique archetype that refers to an opened
   // existential type P.
-  // %1 will be of type $@opened P
+  // %1 will be of type $P
 
 Loadable version of the above: Opens-up the existential
 container associated with ``%0``. The protocol conformances associated

trunk/docs/WindowsBuild.md

@@ -41,7 +41,6 @@ it provides some of the needed headers and libraries.
 1. Clone `apple/swift-corelibs-foundation` into a folder named `swift-corelibs-foundation`
 1. Clone `apple/swift-corelibs-xctest` into a folder name `swift-corelibs-xctest`
 1. Clone `apple/swift-lldb` into a folder named `lldb`
-1. Clone `curl` into a folder named `curl`
 1. Clone `libxml2` into a folder named `libxml2`
 
 - Currently, other repositories in the Swift project have not been tested and
@@ -65,7 +64,6 @@ git clone https://github.com/apple/swift-corelibs-libdispatch
 git clone https://github.com/apple/swift-corelibs-foundation
 git clone https://github.com/apple/swift-corelibs-xctest
 git clone https://github.com/apple/swift-lldb lldb
-git clone https://github.com/curl/curl.git curl
 git clone https://gitlab.gnome.org/GNOME/libxml2.git libxml2
 ```
 
@@ -250,17 +248,7 @@ cmake --build S:\b\libdispatch
 path S:\b\libdispatch;S:\b\libdispatch\src;%PATH%
 ```
 
-### 11. Build curl
-
-```cmd
-pushd "S:\curl"
-.\buildconf.bat
-cd winbuild
-nmake /f Makefile.vc mode=static VC=15 MACHINE=x64
-popd
-```
-
-### 12. Build libxml2
+### 11. Build libxml2
 
 ```cmd
 pushd "S:\libxml2\win32"
@@ -269,7 +257,11 @@ nmake /f Makefile.msvc
 popd
 ```
 
-### 13. Build swift-corelibs-foundation
+### 12. Build swift-corelibs-foundation
+
+To build Foundation you will need builds of:
+
+- `libcurl` (https://curl.haxx.se, download the source, `cd` into `winbuild`, and run `nmake /f Makefile.vc mode=static VC=15 MACHINE=x64`)
 
 ```cmd
 mkdir "S:\b\foundation"
@@ -296,7 +288,7 @@ cmake -G Ninja^
 path S:\b\foundation;%PATH%
 ```
 
-### 14. Build swift-corelibs-xctest
+### 13. Build swift-corelibs-xctest
 
 ```cmd
 mkdir "S:\b\xctest"
@@ -321,7 +313,7 @@ cmake --build S:\b\xctest
 path S:\b\xctest;%PATH%
 ```
 
-### 15. Install Swift on Windows
+### 14. Install Swift on Windows
 
 - Run ninja install:
 

trunk/include/swift-c/SyntaxParser/SwiftSyntaxParser.h

@@ -232,64 +232,6 @@ swiftparse_parse_string(swiftparse_parser_t, const char *source);
 /// declarations, etc.
 SWIFTPARSE_PUBLIC const char* swiftparse_syntax_structure_versioning_identifier(void);
 
-typedef struct {
-  /// Represents the range for the fixit.
-  swiftparse_range_t range;
-  /// Represent the text for replacement.
-  const char* text;
-} swiftparse_diagnostic_fixit_t;
-
-typedef enum {
-  SWIFTPARSER_DIAGNOSTIC_SEVERITY_ERROR = 0,
-  SWIFTPARSER_DIAGNOSTIC_SEVERITY_WARNING = 1,
-  SWIFTPARSER_DIAGNOSTIC_SEVERITY_NOTE = 2,
-} swiftparser_diagnostic_severity_t;
-
-/// This is for the client to ask further information about a diagnostic that is
-/// associated with the pointer.
-/// This pointer is only valid to access from within the
-/// swiftparse_diagnostic_handler_t block
-typedef const void* swiftparser_diagnostic_t;
-
-/// Invoked by the parser when a diagnostic is emitted.
-typedef void(^swiftparse_diagnostic_handler_t)(swiftparser_diagnostic_t);
-
-/// Set the \c swiftparse_diagnostic_handler_t block to be used by the parser.
-///
-/// It isn't required to set a \c swiftparse_diagnostic_handler_t block.
-SWIFTPARSE_PUBLIC void
-swiftparse_parser_set_diagnostic_handler(swiftparse_parser_t,
-                                         swiftparse_diagnostic_handler_t);
-
-/// Get the message of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC const char*
-swiftparse_diagnostic_get_message(swiftparser_diagnostic_t);
-
-/// Get the source location in byte offset to where the diagnostic is issued
-/// in the source buffer.
-SWIFTPARSE_PUBLIC
-unsigned swiftparse_diagnostic_get_source_loc(swiftparser_diagnostic_t diag);
-
-/// Get the number of fixits of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC unsigned
-swiftparse_diagnostic_get_fixit_count(swiftparser_diagnostic_t);
-
-/// Get the fixit at the specified index of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC swiftparse_diagnostic_fixit_t
-swiftparse_diagnostic_get_fixit(swiftparser_diagnostic_t, unsigned);
-
-/// Get the number of highlight ranges of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC unsigned
-swiftparse_diagnostic_get_range_count(swiftparser_diagnostic_t);
-
-/// Get the highlight range at the specified index of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC swiftparse_range_t
-swiftparse_diagnostic_get_range(swiftparser_diagnostic_t, unsigned);
-
-/// Get the severity of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC swiftparser_diagnostic_severity_t
-swiftparse_diagnostic_get_severity(swiftparser_diagnostic_t diag);
-
 SWIFTPARSE_END_DECLS
 
 #endif

trunk/include/swift/AST/Decl.h

@@ -4549,9 +4549,6 @@ class AbstractStorageDecl : public ValueDecl {
   /// other modules.
   bool exportsPropertyDescriptor() const;
 
-  /// True if any of the accessors to the storage is private or fileprivate.
-  bool hasPrivateAccessor() const;
-
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) {
     return D->getKind() >= DeclKind::First_AbstractStorageDecl &&