---

yaml
---
r: 335839
b: refs/heads/rxwei-patch-1
c: 0d27af4
h: refs/heads/master
i:
  335837: da4caf3
  335835: 509f5bb
  335831: acd6099
  335823: d4825b1
  335807: 70ff35b

Author: compnerd

[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: 03f7fb75e044f9b9c8b74b5c3f8ab1b0b153cf77
+refs/heads/rxwei-patch-1: 0d27af4fb87e5bc834579d56466ec6a607d4fa05
 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/lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -99,10 +99,10 @@ static void addMandatoryOptPipeline(SILPassPipelinePlan &P) {
   // optimizer pipeline is run implying we can put a pass that requires OSSA
   // there.
   const auto &Options = P.getOptions();
-  if (Options.EnableMandatorySemanticARCOpts && Options.shouldOptimize()) {
+  P.addClosureLifetimeFixup();
+  if (Options.shouldOptimize()) {
     P.addSemanticARCOpts();
   }
-  P.addClosureLifetimeFixup();
   if (Options.StripOwnershipDuringDiagnosticsPipeline)
     P.addOwnershipModelEliminator();
   P.addMandatoryInlining();

branches/rxwei-patch-1/lib/Sema/TypeCheckType.cpp

@@ -1063,8 +1063,10 @@ static Type diagnoseUnknownType(TypeResolution resolution,
         AbstractFunctionDecl *methodDecl = dc->getInnermostMethodContext();
         bool declaringMethod = methodDecl &&
           methodDecl->getDeclContext() == dc->getParentForLookup();
+        bool isPropertyOfClass = insideClass &&
+          options.is(TypeResolverContext::PatternBindingDecl);
 
-        if (((!insideClass || !declaringMethod) &&
+        if (((!insideClass || !declaringMethod) && !isPropertyOfClass &&
              !options.is(TypeResolverContext::GenericRequirement)) ||
             options.is(TypeResolverContext::ExplicitCastExpr)) {
           Type SelfType = nominal->getSelfInterfaceType();

branches/rxwei-patch-1/test/Frontend/dependencies.swift

@@ -10,7 +10,7 @@
 // CHECK-BASIC-LABEL: - :
 // CHECK-BASIC: Inputs/empty\ file.swift
 // CHECK-BASIC: Swift.swiftmodule
-// CHECK-BASIC-NOT: {{[^\\]}}:
+// CHECK-BASIC-NOT: {{ }}:{{ }}
 
 // CHECK-BASIC-YAML-LABEL: depends-external:
 // CHECK-BASIC-YAML-NOT: empty\ file.swift
@@ -37,7 +37,7 @@
 // CHECK-MULTIPLE-OUTPUTS-LABEL: empty\ file.h :
 // CHECK-MULTIPLE-OUTPUTS: Inputs/empty\ file.swift
 // CHECK-MULTIPLE-OUTPUTS: Swift.swiftmodule
-// CHECK-MULTIPLE-OUTPUTS-NOT: {{[^\\]}}:
+// CHECK-MULTIPLE-OUTPUTS-NOT: {{ }}:{{ }}
 
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-dependencies-path - -resolve-imports %s | %FileCheck -check-prefix=CHECK-IMPORT %s
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/dependencies/extra-header.h -track-system-dependencies -emit-dependencies-path - -resolve-imports %s | %FileCheck -check-prefix=CHECK-IMPORT-TRACK-SYSTEM %s

branches/rxwei-patch-1/test/IDE/Inputs/mock-sdk/FooHelper.framework/Frameworks/FooHelperSub.framework/Headers/FooHelperSub.h

@@ -1,3 +1,7 @@
+
+#ifndef FooHelperSub_FooHelperSub_h
+#define FooHelperSub_FooHelperSub_h
+
 int fooHelperSubFunc1(int a);
 
 enum FooHelperSubEnum1 {
@@ -9,3 +13,5 @@ enum {
   FooHelperSubUnnamedEnumeratorA1
 };
 
+#endif
+

branches/rxwei-patch-1/test/IDE/Inputs/mock-sdk/FooHelper.framework/Headers/FooHelper.h

@@ -1,4 +1,8 @@
-#import <FooHelperSub/FooHelperSub.h>
+
+#ifndef FooHelper_FooHelper_h
+#define FooHelper_FooHelper_h
+
+#include <FooHelperSub/FooHelperSub.h>
 
 int fooHelperFunc1(int a);
 
@@ -7,3 +11,5 @@ enum {
   FooHelperUnnamedEnumeratorA2,
 };
 
+#endif
+

branches/rxwei-patch-1/test/Index/Store/output-failure.swift

@@ -1,5 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: mkdir %t/idx
+// UNSUPPORTED: OS=windows-msvc
 
 // Before indexing, do a dry-run to ensure any clang modules are cached. We
 // want to isolate the error that comes from swift's indexing support, not

branches/rxwei-patch-1/test/type/self.swift

@@ -70,6 +70,15 @@ class A<T> {
     // expected-warning@-1 {{conditional cast from 'Self' to 'Self' always succeeds}}
     // expected-warning@-2 {{conditional downcast from 'Self?' to 'A<T>' is equivalent to an implicit conversion to an optional 'A<T>'}}
   }
+  func copy() -> Self {
+    let copy = Self.init(a: 11)
+    return copy
+  }
+
+  var copied: Self { // expected-error {{'Self' is only available in a protocol or as the result of a method in a class; did you mean 'A'?}}
+    let copy = Self.init(a: 11)
+    return copy
+  }
 }
 
 class B: A<Int> {
@@ -88,6 +97,14 @@ class B: A<Int> {
   override class func y() {
     print("override \(Self.self).\(#function)")
   }
+  override func copy() -> Self {
+    let copy = super.copy() as! Self // supported
+    return copy
+  }
+  override var copied: Self { // expected-error {{'Self' is only available in a protocol or as the result of a method in a class; did you mean 'B'?}}
+    let copy = super.copied as! Self // unsupported
+    return copy
+  }
 }
 
 class C {
@@ -121,6 +138,15 @@ struct S2 {
       // expected-warning@-1 {{conditional cast from 'S2.S3<T>' to 'S2.S3<T>' always succeeds}}
     }
   }
+  func copy() -> Self {
+    let copy = Self.init()
+    return copy
+  }
+
+  var copied: Self {
+    let copy = Self.init()
+    return copy
+  }
 }
 
 extension S2 {

branches/rxwei-patch-1/tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -38,6 +38,7 @@
 #include "swift/AST/USRGeneration.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/DiagnosticsModuleDiffer.h"
 #include "swift/Basic/ColorUtils.h"
 #include "swift/Basic/JSONSerialization.h"
 #include "swift/Basic/LLVMInitialize.h"
@@ -195,6 +196,7 @@ class SDKContext {
   bool shouldIgnore(Decl *D, const Decl* Parent = nullptr) const;
   ArrayRef<BreakingAttributeInfo> getBreakingAttributeInfo() const { return BreakingAttrs; }
   Optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) const;
+
   template<class YAMLNodeTy, typename ...ArgTypes>
   void diagnose(YAMLNodeTy node, Diag<ArgTypes...> ID,
                 typename detail::PassArgument<ArgTypes>::type... args) {
@@ -336,6 +338,19 @@ class SDKNodeDecl: public SDKNode {
   uint8_t getFixedBinaryOrder() const { return *FixedBinaryOrder; }
   virtual void jsonize(json::Output &Out) override;
   virtual void diagnose(SDKNode *Right) override;
+
+  // The first argument of the diag is always screening info.
+  template<typename ...ArgTypes>
+  void emitDiag(Diag<StringRef, ArgTypes...> ID,
+                typename detail::PassArgument<ArgTypes>::type... Args) const {
+    // Don't emit objc decls if we care about swift exclusively
+    if (Ctx.getOpts().SwiftOnly) {
+      if (isObjc())
+        return;
+    }
+    Ctx.getDiags().diagnose(SourceLoc(), ID, getScreenInfo(),
+                            std::move(Args)...);
+  }
 };
 
 class SDKNodeRoot: public SDKNode {