---

yaml
---
r: 342010
b: refs/heads/rxwei-patch-1
c: 2cf9f09
h: refs/heads/master

Author: gottesmm

[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: 8c476c2a540f57c9038e922ee59808144644b191
+refs/heads/rxwei-patch-1: 2cf9f09e2c4033414e14e53a67777bd5e0092691
 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/README.md

@@ -14,7 +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
@@ -30,7 +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
@@ -106,6 +116,56 @@ 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
 
 ### Usage
@@ -159,20 +219,29 @@ of some 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
@@ -193,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

branches/rxwei-patch-1/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/rxwei-patch-1/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

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

@@ -201,32 +201,6 @@ class ProtocolRequiresClassRequest:
   void cacheResult(bool value) const;
 };
 
-/// Determine whether an existential conforming to a protocol can be matched
-/// with a generic type parameter constrained to that protocol.
-class ExistentialConformsToSelfRequest:
-    public SimpleRequest<ExistentialConformsToSelfRequest,
-                         bool(ProtocolDecl *),
-                         CacheKind::SeparatelyCached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  llvm::Expected<bool> evaluate(Evaluator &evaluator, ProtocolDecl *decl) const;
-
-public:
-  // Cycle handling.
-  void diagnoseCycle(DiagnosticEngine &diags) const;
-  void noteCycleStep(DiagnosticEngine &diags) const;
-
-  // Separate caching.
-  bool isCached() const { return true; }
-  Optional<bool> getCachedResult() const;
-  void cacheResult(bool value) const;
-};
-
 /// Determine whether the given declaration is 'final'.
 class IsFinalRequest :
     public SimpleRequest<IsFinalRequest,

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

@@ -20,7 +20,6 @@ SWIFT_TYPEID(EnumRawTypeRequest)
 SWIFT_TYPEID(OverriddenDeclsRequest)
 SWIFT_TYPEID(IsObjCRequest)
 SWIFT_TYPEID(ProtocolRequiresClassRequest)
-SWIFT_TYPEID(ExistentialConformsToSelfRequest)
 SWIFT_TYPEID(IsFinalRequest)
 SWIFT_TYPEID(IsDynamicRequest)
 SWIFT_TYPEID(RequirementRequest)

branches/rxwei-patch-1/lib/AST/Decl.cpp

@@ -4329,9 +4329,43 @@ bool ProtocolDecl::requiresSelfConformanceWitnessTable() const {
   return isSpecificProtocol(KnownProtocolKind::Error);
 }
 
-bool ProtocolDecl::existentialConformsToSelf() const {
-  return evaluateOrDefault(getASTContext().evaluator,
-    ExistentialConformsToSelfRequest{const_cast<ProtocolDecl *>(this)}, true);
+bool ProtocolDecl::existentialConformsToSelfSlow() {
+  // Assume for now that the existential conforms to itself; this
+  // prevents circularity issues.
+  Bits.ProtocolDecl.ExistentialConformsToSelfValid = true;
+  Bits.ProtocolDecl.ExistentialConformsToSelf = true;
+
+  // If it's not @objc, it conforms to itself only if it has a
+  // self-conformance witness table.
+  if (!isObjC()) {
+    bool hasSelfConformance = requiresSelfConformanceWitnessTable();
+    Bits.ProtocolDecl.ExistentialConformsToSelf = hasSelfConformance;
+    return hasSelfConformance;
+  }
+
+  // Check whether this protocol conforms to itself.
+  for (auto member : getMembers()) {
+    if (member->isInvalid())
+      continue;
+
+    if (auto vd = dyn_cast<ValueDecl>(member)) {
+      if (!vd->isInstanceMember()) {
+        // A protocol cannot conform to itself if it has static members.
+        Bits.ProtocolDecl.ExistentialConformsToSelf = false;
+        return false;
+      }
+    }
+  }
+
+  // Check whether any of the inherited protocols fail to conform to
+  // themselves.
+  for (auto proto : getInheritedProtocols()) {
+    if (!proto->existentialConformsToSelf()) {
+      Bits.ProtocolDecl.ExistentialConformsToSelf = false;
+      return false;
+    }
+  }
+  return true;
 }
 
 /// Classify usages of Self in the given type.

branches/rxwei-patch-1/lib/AST/TypeCheckRequests.cpp

@@ -211,31 +211,6 @@ void ProtocolRequiresClassRequest::cacheResult(bool value) const {
   decl->setCachedRequiresClass(value);
 }
 
-//----------------------------------------------------------------------------//
-// existentialConformsToSelf computation.
-//----------------------------------------------------------------------------//
-
-void ExistentialConformsToSelfRequest::diagnoseCycle(DiagnosticEngine &diags) const {
-  auto decl = std::get<0>(getStorage());
-  diags.diagnose(decl, diag::circular_protocol_def, decl->getName());
-}
-
-void ExistentialConformsToSelfRequest::noteCycleStep(DiagnosticEngine &diags) const {
-  auto requirement = std::get<0>(getStorage());
-  diags.diagnose(requirement, diag::kind_declname_declared_here,
-                 DescriptiveDeclKind::Protocol, requirement->getName());
-}
-
-Optional<bool> ExistentialConformsToSelfRequest::getCachedResult() const {
-  auto decl = std::get<0>(getStorage());
-  return decl->getCachedExistentialConformsToSelf();
-}
-
-void ExistentialConformsToSelfRequest::cacheResult(bool value) const {
-  auto decl = std::get<0>(getStorage());
-  decl->setCachedExistentialConformsToSelf(value);
-}
-
 //----------------------------------------------------------------------------//
 // isFinal computation.
 //----------------------------------------------------------------------------//

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/Sema/CSDiag.cpp

@@ -3219,20 +3219,13 @@ class ArgumentMatcher : public MatchCallArgumentListener {
 
     assert(insertLoc.isValid() && "missing argument after trailing closure?");
 
-    if (name.empty()) {
+    if (name.empty())
       TC.diagnose(insertLoc, diag::missing_argument_positional,
                   missingParamIdx + 1)
           .fixItInsert(insertLoc, insertText.str());
-    } else {
-      if (isPropertyWrapperImplicitInit()) {
-        auto TE = cast<TypeExpr>(FnExpr);
-        TC.diagnose(TE->getLoc(), diag::property_wrapper_missing_arg_init, name,
-                    TE->getInstanceType()->getString());
-      } else {
-        TC.diagnose(insertLoc, diag::missing_argument_named, name)
-            .fixItInsert(insertLoc, insertText.str());
-      }
-    }
+    else
+      TC.diagnose(insertLoc, diag::missing_argument_named, name)
+          .fixItInsert(insertLoc, insertText.str());
 
     auto candidate = CandidateInfo[0];
     if (candidate.getDecl())
@@ -3242,27 +3235,6 @@ class ArgumentMatcher : public MatchCallArgumentListener {
     Diagnosed = true;
   }
 
-  bool isPropertyWrapperImplicitInit() {
-    auto TE = dyn_cast<TypeExpr>(FnExpr);
-    if (!TE)
-      return false;
-
-    auto instanceTy = TE->getInstanceType();
-    if (!instanceTy)
-      return false;
-
-    auto nominalDecl = instanceTy->getAnyNominal();
-    if (!(nominalDecl &&
-          nominalDecl->getAttrs().hasAttribute<PropertyWrapperAttr>()))
-      return false;
-
-    if (auto *parentExpr = CandidateInfo.CS.getParentExpr(FnExpr)) {
-      return parentExpr->isImplicit() && isa<CallExpr>(parentExpr);
-    }
-
-    return false;
-  }
-
   bool missingLabel(unsigned paramIdx) override {
     return false;
   }