---

yaml
---
r: 342013
b: refs/heads/rxwei-patch-1
c: be609e8
h: refs/heads/master
i:
  342011: e83284e

Author: nkcsgexi

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 4d57590fa9021e837ff56a54a3a1c64b6ce2a02a
+refs/heads/rxwei-patch-1: be609e82ef1fc60ebe549213bd0a2a024eb03850
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/benchmark/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 import Foundation
@@ -9,10 +9,15 @@ unsupportedTests.insert("ObjectiveCBridging")
 unsupportedTests.insert("ObjectiveCBridgingStubs")
 #endif
 
-// This is a stop gap hack so we can edit benchmarks in Xcode.
-let singleSourceLibraries: [String] = {
+//===---
+// Single Source Libraries
+//
+
+/// Return the source files in subDirectory that we will translate into
+/// libraries. Each source library will be compiled as its own module.
+func getSingleSourceLibraries(subDirectory: String) -> [String] {
   let f = FileManager.`default`
-  let dirURL = URL(fileURLWithPath: "single-source").absoluteURL
+  let dirURL = URL(fileURLWithPath: subDirectory)
   let fileURLs = try! f.contentsOfDirectory(at: dirURL,
                                             includingPropertiesForKeys: nil)
   return fileURLs.compactMap { (path: URL) -> String? in
@@ -25,27 +30,45 @@ let singleSourceLibraries: [String] = {
       return nil
     }
 
-    let s = String(c[0])
+    let name = String(c[0])
 
     // We do not support this test.
-    if unsupportedTests.contains(s) {
+    if unsupportedTests.contains(name) {
       return nil
     }
 
-    assert(s != "PrimsSplit")
-    return s
+    return name
   }
-}()
+}
+
+var singleSourceLibraryDirs: [String] = []
+singleSourceLibraryDirs.append("single-source")
+
+var singleSourceLibraries: [String] = singleSourceLibraryDirs.flatMap {
+  getSingleSourceLibraries(subDirectory: $0)
+}
 
-let multiSourceLibraries: [String] = {
+//===---
+// Multi Source Libraries
+//
+
+func getMultiSourceLibraries(subDirectory: String) -> [(String, String)] {
   let f = FileManager.`default`
-  let dirURL = URL(fileURLWithPath: "multi-source").absoluteURL
-  let fileURLs = try! f.contentsOfDirectory(at: dirURL,
-                                            includingPropertiesForKeys: nil)
-  return fileURLs.map { (path: URL) -> String in
-    return path.lastPathComponent
-  }
-}()
+  let dirURL = URL(string: subDirectory)!
+  let subDirs = try! f.contentsOfDirectory(at: dirURL, includingPropertiesForKeys: nil)
+  return subDirs.map { (subDirectory, $0.lastPathComponent) }
+}
+
+var multiSourceLibraryDirs: [String] = []
+multiSourceLibraryDirs.append("multi-source")
+
+var multiSourceLibraries: [(parentSubDir: String, name: String)] = multiSourceLibraryDirs.flatMap {
+  getMultiSourceLibraries(subDirectory: $0)
+}
+
+//===---
+// Products
+//
 
 var products: [Product] = []
 products.append(.library(name: "TestsUtils", type: .static, targets: ["TestsUtils"]))
@@ -54,9 +77,15 @@ products.append(.library(name: "DriverUtils", type: .static, targets: ["DriverUt
 products.append(.library(name: "ObjectiveCTests", type: .static, targets: ["ObjectiveCTests"]))
 #endif
 products.append(.executable(name: "SwiftBench", targets: ["SwiftBench"]))
-products.append(.library(name: "PrimsSplit", type: .static, targets: ["PrimsSplit"]))
+
 products += singleSourceLibraries.map { .library(name: $0, type: .static, targets: [$0]) }
-products += multiSourceLibraries.map { .library(name: $0, type: .static, targets: [$0]) }
+products += multiSourceLibraries.map {
+  return .library(name: $0.name, type: .static, targets: [$0.name])
+}
+
+//===---
+// Targets
+//
 
 var targets: [Target] = []
 targets.append(.target(name: "TestsUtils", path: "utils", sources: ["TestsUtils.swift"]))
@@ -73,7 +102,7 @@ swiftBenchDeps.append(.target(name: "ObjectiveCTests"))
 #endif
 swiftBenchDeps.append(.target(name: "DriverUtils"))
 swiftBenchDeps += singleSourceLibraries.map { .target(name: $0) }
-swiftBenchDeps += multiSourceLibraries.map { .target(name: $0) }
+swiftBenchDeps += multiSourceLibraries.map { .target(name: $0.name) }
 
 targets.append(
     .target(name: "SwiftBench",
@@ -92,20 +121,27 @@ var singleSourceDeps: [Target.Dependency] = [.target(name: "TestsUtils")]
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 singleSourceDeps.append(.target(name: "ObjectiveCTests"))
 #endif
-targets += singleSourceLibraries.map { x in
-    return .target(name: x,
+
+targets += singleSourceLibraries.map { name in
+  return .target(name: name,
       dependencies: singleSourceDeps,
       path: "single-source",
-      sources: ["\(x).swift"])
+      sources: ["\(name).swift"])
 }
-targets += multiSourceLibraries.map { x in
-  return .target(name: x,
+
+targets += multiSourceLibraries.map { lib in
+  return .target(
+    name: lib.name,
     dependencies: [
       .target(name: "TestsUtils")
     ],
-    path: "multi-source/\(x)")
+    path: lib.parentSubDir)
 }
 
+//===---
+// Top Level Definition
+//
+
 let p = Package(
   name: "swiftbench",
   products: products,

branches/rxwei-patch-1/benchmark/README.md

@@ -1,10 +1,8 @@
-Swift Benchmark Suite
-=====================
+# Swift Benchmark Suite
 
 This directory contains the Swift Benchmark Suite.
 
-Running Swift Benchmarks
-------------------------
+## Running Swift Benchmarks
 
 To run Swift benchmarks, pass the `--benchmark` flag to `build-script`. The
 current benchmark results will be compared to the previous run's results if
@@ -16,8 +14,17 @@ impacting changes, and run the benchmarks again. Upon benchmark completion, the
 benchmark results for the development branch will be compared to the most
 recent benchmark results for `master`.
 
-Building with build-script
---------------------------
+## Building the Swift Benchmarks
+
+The swift benchmark suite currently supports building with CMake and
+SwiftPM. We support the following platforms respectively.
+
+* CMake: macOS, iOS, tvOS, watchOS
+* SwiftPM: macOS, linux
+
+We describe how to build both standalone and with build-script below.
+
+### build-script invoking CMake
 
 By default, Swift benchmarks for OS X are compiled during the Swift build
 process. To build Swift benchmarks for additional platforms, pass the following
@@ -33,8 +40,7 @@ drivers dynamically link Swift standard library dylibs from a path
 relative to their run-time location (../lib/swift) so the standard
 library should be distributed alongside them.
 
-Building Independently
-----------------------
+### CMake Standalone (no build-script)
 
 To build the Swift benchmarks using only an Xcode installation: install an
 Xcode version with Swift support, install cmake 2.8.12, and ensure Xcode is
@@ -110,8 +116,57 @@ installed libraries instead, enable
 This will reflect the performance of the Swift standard library
 installed on the device, not the one included in the Swift root.
 
-Using the Benchmark Driver
---------------------------
+### build-script using SwiftPM+LLBuild
+
+To build the benchmarks using build-script/swiftpm, one must build both
+swiftpm/llbuild as part of one's build and create a "just-built" toolchain. This
+toolchain is then used by build-script to compile the benchmarks. This is
+accomplished by passing to build-script the following options:
+
+```
+swift-source$ swift/utils/build-script --swiftpm --llbuild --install-swift --install-swiftpm --install-llbuild --toolchain-benchmarks
+```
+
+build-script will then compile the toolchain and then build the benchmarks 3
+times, once for each optimization level, at the path
+`./build/benchmarks-$PLATFORM-$ARCH/bin/Benchmark_$OPT`:
+
+### Standalone SwiftPM/LLBuild
+
+The benchmark suite can be built with swiftpm/llbuild without needing any help
+from build-script by invoking swift build in the benchmark directory:
+
+```
+swift-source/swift/benchmark$ swift build -configuration release
+swift-source/swift/benchmark$ .build/release/SwiftBench
+#,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs)
+1,Ackermann,1,169,169,169,0,169
+2,AngryPhonebook,1,2044,2044,2044,0,2044
+...
+```
+
+## Editing in Xcode
+
+It is now possible to work on swiftpm benchmarks in Xcode! This is done by using
+the ability swiftpm build of the benchmarks to generate an xcodeproject. This is
+done by running the commands:
+
+```
+swift-source/swift/benchmark$ swift package generate-xcodeproj
+generated: ./swiftbench.xcodeproj
+swift-source/swift/benchmark$ open swiftbench.xcodeproj
+```
+
+Assuming that Xcode is installed on ones system, this will open the project in
+Xcode. The benchmark binary is built by the target 'SwiftBench'.
+
+**NOTE: Files added to the Xcode project will not be persisted back to the
+package! To add new benchmarks follow the instructions from the section below!**
+
+**NOTE: By default if one just builds/runs the benchmarks in Xcode, the
+benchmarks will be compiled with -Onone!**
+
+## Using the Benchmark Driver
 
 ### Usage
 
@@ -154,32 +209,39 @@ You can use test numbers instead of test names like this:
 Test numbers are not stable in the long run, adding and removing tests from the
 benchmark suite will reorder them, but they are stable for a given build.
 
-Using the Harness Generator
----------------------------
+## Using the Harness Generator
 
 `scripts/generate_harness/generate_harness.py` runs `gyb` to automate generation
 of some benchmarks.
 
 ** FIXME ** `gyb` should be invoked automatically during the
    build so that manually invoking `generate_harness.py` is not required.
 
-Adding New Benchmarks
----------------------
+## Adding New Benchmarks
 
-The harness generator supports both single and multiple file tests.
+Adding a new benchmark requires some boilerplate updates. To ease this (and
+document the behavior), a harness generator script is provided for both
+single/multiple file tests.
 
-To add a new single file test, execute the following script with the new of the benchmark:
+To add a new single file test, execute the following script with the new of the
+benchmark:
 
 ```
 swift-source$ ./swift/benchmark/scripts/create_benchmark.py YourTestNameHere
 ```
 
 The script will automatically:
+
 1.  Add a new Swift file (`YourTestNameHere.swift`), built according to
     the template below, to the `single-source` directory.
 2.  Add the filename of the new Swift file to `CMakeLists.txt`.
 3.  Edit `main.swift` by importing and registering your new Swift module.
 
+No changes are needed to the Package.swift file since the benchmark's
+Package.swift is set to dynamically lookup each Swift file in `single-source`
+and translate each of those individual .swift files into individual modules. So
+the new test file will be automatically found.
+
 To add a new multiple file test:
 
 1.  Add a new directory and files under the `multi-source` directory as
@@ -200,6 +262,9 @@ To add a new multiple file test:
 
 3.  Edit `main.swift`. Import and register your new Swift module.
 
+No changes are needed to the swiftpm build since it knows how to infer
+multi-source libraries automatically from the library structure.
+
 **Note:**
 
 The benchmark harness will execute the routine referenced by
@@ -244,8 +309,8 @@ public func run_YourTestName(N: Int) {
 The current set of tags are defined by the `BenchmarkCategory` enum in
 `TestsUtils.swift` .
 
-Testing the Benchmark Drivers
------------------------------
+## Testing the Benchmark Drivers
+
 When working on tests, after the initial build
 ````
 swift-source$ ./swift/utils/build-script -R -B

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -4120,7 +4120,20 @@ class ProtocolDecl final : public NominalTypeDecl {
     Bits.ProtocolDecl.RequiresClass = requiresClass;
   }
 
-  bool existentialConformsToSelfSlow();
+  /// Returns the cached result of \c existentialConformsToSelf or \c None if it
+  /// hasn't yet been computed.
+  Optional<bool> getCachedExistentialConformsToSelf() const {
+    if (Bits.ProtocolDecl.ExistentialConformsToSelfValid)
+      return Bits.ProtocolDecl.ExistentialConformsToSelf;
+
+    return None;
+  }
+
+  /// Caches the result of \c existentialConformsToSelf
+  void setCachedExistentialConformsToSelf(bool result) {
+    Bits.ProtocolDecl.ExistentialConformsToSelfValid = true;
+    Bits.ProtocolDecl.ExistentialConformsToSelf = result;
+  }
 
   bool existentialTypeSupportedSlow();
 
@@ -4134,6 +4147,7 @@ class ProtocolDecl final : public NominalTypeDecl {
   friend class SuperclassTypeRequest;
   friend class RequirementSignatureRequest;
   friend class ProtocolRequiresClassRequest;
+  friend class ExistentialConformsToSelfRequest;
   friend class TypeChecker;
 
 public:
@@ -4204,13 +4218,7 @@ class ProtocolDecl final : public NominalTypeDecl {
   /// This is only permitted if there is nothing "non-trivial" that we
   /// can do with the metatype, which means the protocol must not have
   /// any static methods and must be declared @objc.
-  bool existentialConformsToSelf() const {
-    if (Bits.ProtocolDecl.ExistentialConformsToSelfValid)
-      return Bits.ProtocolDecl.ExistentialConformsToSelf;
-
-    return const_cast<ProtocolDecl *>(this)
-             ->existentialConformsToSelfSlow();
-  }
+  bool existentialConformsToSelf() const;
 
   /// Does this protocol require a self-conformance witness table?
   bool requiresSelfConformanceWitnessTable() const;

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -4523,6 +4523,9 @@ WARNING(property_wrapper_init_initialValue,none,
         ())
 ERROR(property_wrapper_projection_value_missing,none,
       "could not find projection value property %0", (Identifier))
+ERROR(property_wrapper_missing_arg_init, none, "missing argument for parameter "
+      "%0 in property wrapper initializer; add 'wrappedValue' and %0 "
+      "arguments in '@%1(...)'", (Identifier, StringRef))
 
 //------------------------------------------------------------------------------
 // MARK: function builder diagnostics