---

yaml
---
r: 341994
b: refs/heads/rxwei-patch-1
c: af37b2c
h: refs/heads/master

Author: Marc Rasi

[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: b89764a05f014abdf98726e510c6f9a35f01b0f6
+refs/heads/rxwei-patch-1: af37b2cf5e7390338b833bcac457d0efe15e68ab
 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: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/rxwei-patch-1/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,7 +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 with build-script
+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
@@ -30,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.
 
-## Building Independently
+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
@@ -106,7 +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.
 
-## Using the Benchmark Driver
+Using the Benchmark Driver
+--------------------------
 
 ### Usage
 
@@ -149,15 +154,17 @@ 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.
 
@@ -237,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/rxwei-patch-1/include/swift/Index/Utils.h

@@ -0,0 +1,41 @@
+//===--- Utils.h - Index utilities that are generally useful ----*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_INDEX_UTILS_H
+#define SWIFT_INDEX_UTILS_H
+
+#include "swift/Basic/LLVM.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/SmallVector.h"
+
+namespace swift {
+class ValueDecl;
+
+/// Collect all the protocol requirements that a given declaration can
+///   provide default implementations for. VD is a declaration in extension
+///   declaration. Scratch is the buffer to collect those protocol
+///   requirements.
+///
+/// \returns the slice of Scratch
+ArrayRef<ValueDecl*>
+canDeclProvideDefaultImplementationFor(ValueDecl* VD,
+                                       llvm::SmallVectorImpl<ValueDecl*> &Scratch);
+
+/// Get decls that the given decl overrides, protocol requirements that
+///   it serves as a default implementation of, and optionally protocol
+///   requirements it satisfies in a conforming class
+std::vector<ValueDecl*>
+getOverriddenDecls(ValueDecl *VD, bool IncludeProtocolRequirements = true,
+                   bool Transitive = false);
+
+} // end namespace swift
+#endif // SWIFT_INDEX_UTILS_H

branches/rxwei-patch-1/include/swift/Sema/IDETypeChecking.h

@@ -241,24 +241,6 @@ namespace swift {
   Optional<std::pair<Type, Type>>
   getRootAndResultTypeOfKeypathDynamicMember(SubscriptDecl *subscript,
                                              const DeclContext *DC);
-  /// Collect all the protocol requirements that a given declaration can
-  ///   provide default implementations for. VD is a declaration in extension
-  ///   declaration. Scratch is the buffer to collect those protocol
-  ///   requirements.
-  ///
-  /// \returns the slice of Scratch
-  ArrayRef<ValueDecl*>
-  canDeclProvideDefaultImplementationFor(ValueDecl* VD,
-                                         llvm::SmallVectorImpl<ValueDecl*> &Scratch);
-
-  /// Get decls that the given decl overrides, protocol requirements that
-  ///   it serves as a default implementation of, and optionally protocol
-  ///   requirements it satisfies in a conforming class
-  std::vector<ValueDecl*>
-  collectAllOverriddenDecls(ValueDecl *VD,
-                            bool IncludeProtocolRequirements = true,
-                            bool Transitive = false);
-
 }
 
 #endif

branches/rxwei-patch-1/lib/IDE/ExprContextAnalysis.cpp

@@ -583,15 +583,6 @@ class ExprContextAnalyzer {
     case ExprKind::Array: {
       if (auto type = ParsedExpr->getType()) {
         recordPossibleType(type);
-        break;
-      }
-
-      // Check context types of the array literal expression.
-      ExprContextInfo arrayCtxtInfo(DC, Parent);
-      for (auto arrayT : arrayCtxtInfo.getPossibleTypes()) {
-        if (auto boundGenericT = arrayT->getAs<BoundGenericType>())
-          if (boundGenericT->getDecl() == Context.getArrayDecl())
-            recordPossibleType(boundGenericT->getGenericArgs()[0]);
       }
       break;
     }

branches/rxwei-patch-1/lib/IDE/IDETypeChecking.cpp

@@ -740,69 +740,3 @@ swift::collectExpressionType(SourceFile &SF,
   Walker.walk(SF);
   return Scratch;
 }
-
-static Type getContextFreeInterfaceType(ValueDecl *VD) {
-  if (auto AFD = dyn_cast<AbstractFunctionDecl>(VD)) {
-    return AFD->getMethodInterfaceType();
-  }
-  return VD->getInterfaceType();
-}
-
-ArrayRef<ValueDecl*> swift::
-canDeclProvideDefaultImplementationFor(ValueDecl* VD,
-                                       llvm::SmallVectorImpl<ValueDecl*> &Scratch) {
-
-  // Skip decls that don't have valid names.
-  if (!VD->getFullName())
-    return {};
-
-  // Check if VD is from a protocol extension.
-  auto P = VD->getDeclContext()->getExtendedProtocolDecl();
-  if (!P)
-    return {};
-
-  // Look up all decls in the protocol's inheritance chain for the ones with
-  // the same name with VD.
-  ResolvedMemberResult LookupResult =
-  resolveValueMember(*P->getInnermostDeclContext(),
-                     P->getDeclaredInterfaceType(), VD->getFullName());
-
-  auto VDType = getContextFreeInterfaceType(VD);
-  for (auto Mem : LookupResult.getMemberDecls(InterestedMemberKind::All)) {
-    if (isa<ProtocolDecl>(Mem->getDeclContext())) {
-      if (Mem->isProtocolRequirement() &&
-          getContextFreeInterfaceType(Mem)->isEqual(VDType)) {
-        // We find a protocol requirement VD can provide default
-        // implementation for.
-        Scratch.push_back(Mem);
-      }
-    }
-  }
-  return Scratch;
-}
-
-std::vector<ValueDecl*> swift::
-collectAllOverriddenDecls(ValueDecl *VD, bool IncludeProtocolRequirements,
-                   bool Transitive) {
-  std::vector<ValueDecl*> results;
-
-  if (auto Overridden = VD->getOverriddenDecl()) {
-    results.push_back(Overridden);
-    while (Transitive && (Overridden = Overridden->getOverriddenDecl()))
-      results.push_back(Overridden);
-  }
-
-  // Collect the protocol requirements this decl is a default impl for
-  llvm::SmallVector<ValueDecl*, 2> Buffer;
-  for (auto Req : canDeclProvideDefaultImplementationFor(VD, Buffer)) {
-    results.push_back(Req);
-  }
-
-  if (IncludeProtocolRequirements) {
-    for (auto Satisfied : VD->getSatisfiedProtocolRequirements()) {
-      results.push_back(Satisfied);
-    }
-  }
-
-  return results;
-}

branches/rxwei-patch-1/lib/Index/CMakeLists.txt

@@ -4,5 +4,4 @@ add_swift_host_library(swiftIndex STATIC
   IndexRecord.cpp
   IndexSymbol.cpp)
 target_link_libraries(swiftIndex PRIVATE
-  swiftAST
-  swiftIDE)
+  swiftAST)