---

yaml
---
r: 313213
b: refs/heads/tensorflow-merge
c: 009d0e5
h: refs/heads/master
i:
  313211: 460a614

Author: varungandhi-apple

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: 05d2ef22b8c27e1bf07a4c4f5d5765e59bb8a7ee
+refs/heads/tensorflow-merge: 009d0e548107fc5405a3c3c565563d8a66efec60
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/benchmark/Package.swift

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

branches/tensorflow-merge/benchmark/README.md

@@ -1,8 +1,10 @@
-# 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
@@ -14,17 +16,8 @@ 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 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
+Building with build-script
+--------------------------
 
 By default, Swift benchmarks for OS X are compiled during the Swift build
 process. To build Swift benchmarks for additional platforms, pass the following
@@ -40,7 +33,8 @@ 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.
 
-### CMake Standalone (no build-script)
+Building Independently
+----------------------
 
 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
@@ -116,57 +110,8 @@ 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.
 
-### 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
+Using the Benchmark Driver
+--------------------------
 
 ### Usage
 
@@ -209,39 +154,32 @@ 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
+---------------------
 
-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.
+The harness generator supports both single and 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
@@ -262,9 +200,6 @@ 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
@@ -309,8 +244,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/tensorflow-merge/include/swift/AST/ASTTypeIDZone.def

@@ -16,7 +16,6 @@
 //===----------------------------------------------------------------------===//
 SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
 SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
-SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
 SWIFT_TYPEID_NAMED(Decl *, Decl)
 SWIFT_TYPEID(Type)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)

branches/tensorflow-merge/include/swift/AST/Decl.h

@@ -4120,20 +4120,7 @@ class ProtocolDecl final : public NominalTypeDecl {
     Bits.ProtocolDecl.RequiresClass = requiresClass;
   }
 
-  /// 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 existentialConformsToSelfSlow();
 
   bool existentialTypeSupportedSlow();
 
@@ -4147,7 +4134,6 @@ class ProtocolDecl final : public NominalTypeDecl {
   friend class SuperclassTypeRequest;
   friend class RequirementSignatureRequest;
   friend class ProtocolRequiresClassRequest;
-  friend class ExistentialConformsToSelfRequest;
   friend class TypeChecker;
 
 public:
@@ -4218,7 +4204,13 @@ 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;
+  bool existentialConformsToSelf() const {
+    if (Bits.ProtocolDecl.ExistentialConformsToSelfValid)
+      return Bits.ProtocolDecl.ExistentialConformsToSelf;
+
+    return const_cast<ProtocolDecl *>(this)
+             ->existentialConformsToSelfSlow();
+  }
 
   /// Does this protocol require a self-conformance witness table?
   bool requiresSelfConformanceWitnessTable() const;

branches/tensorflow-merge/include/swift/AST/DiagnosticsSema.def

@@ -4523,9 +4523,6 @@ 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