---

yaml
---
r: 347516
b: refs/heads/master
c: 1180f23
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6e3a6ebd32e301ecda9d499896786d28bb659ab9
+refs/heads/master: 1180f23b9a4975ae16a3299bda3d6718d7b6153a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckType.cpp

@@ -1033,6 +1033,44 @@ static std::string getDeclNameFromContext(DeclContext *dc,
   }
 }
 
+//
+// SE-0068 is "Expanding Swift Self to class members and value types"
+// https://github.com/apple/swift-evolution/blob/master/proposals/0068-universal-self.md
+//
+static Type SelfAllowedBySE0068(TypeResolution resolution,
+                                TypeResolutionOptions options) {
+  auto dc = resolution.getDeclContext();
+  ASTContext &ctx = dc->getASTContext();
+  DeclContext *nominalDC = nullptr;
+  NominalTypeDecl *nominal = nullptr;
+  if ((nominalDC = dc->getInnermostTypeContext()) &&
+      (nominal = nominalDC->getSelfNominalTypeDecl())) {
+    assert(!isa<ProtocolDecl>(nominal) && "Cannot be a protocol");
+
+    bool insideClass = nominalDC->getSelfClassDecl() != nullptr;
+    AbstractFunctionDecl *methodDecl = dc->getInnermostMethodContext();
+    bool declaringMethod = methodDecl &&
+      methodDecl->getDeclContext() == dc->getParentForLookup();
+    bool isMutablePropertyOrSubscriptOfClass = insideClass &&
+      (options.is(TypeResolverContext::PatternBindingDecl) ||
+       options.is(TypeResolverContext::FunctionResult));
+    bool isTypeAliasInClass = insideClass &&
+      options.is(TypeResolverContext::TypeAliasDecl);
+
+    if (((!insideClass || !declaringMethod) &&
+         !isMutablePropertyOrSubscriptOfClass && !isTypeAliasInClass &&
+         !options.is(TypeResolverContext::GenericRequirement)) ||
+        options.is(TypeResolverContext::ExplicitCastExpr)) {
+      Type SelfType = nominal->getSelfInterfaceType();
+      if (insideClass)
+        SelfType = DynamicSelfType::get(SelfType, ctx);
+      return resolution.mapTypeIntoContext(SelfType);
+    }
+  }
+
+  return Type();
+}
+
 /// Diagnose a reference to an unknown type.
 ///
 /// This routine diagnoses a reference to an unknown type, and
@@ -1058,25 +1096,10 @@ static Type diagnoseUnknownType(TypeResolution resolution,
       NominalTypeDecl *nominal = nullptr;
       if ((nominalDC = dc->getInnermostTypeContext()) &&
           (nominal = nominalDC->getSelfNominalTypeDecl())) {
+        // Attempt to refer to 'Self' within a non-protocol nominal
+        // type. Fix this by replacing 'Self' with the nominal type name.
         assert(!isa<ProtocolDecl>(nominal) && "Cannot be a protocol");
 
-        bool insideClass = nominalDC->getSelfClassDecl() != nullptr;
-        AbstractFunctionDecl *methodDecl = dc->getInnermostMethodContext();
-        bool declaringMethod = methodDecl &&
-          methodDecl->getDeclContext() == dc->getParentForLookup();
-        bool isPropertyOfClass = insideClass &&
-          options.is(TypeResolverContext::PatternBindingDecl);
-
-        if (((!insideClass || !declaringMethod) && !isPropertyOfClass &&
-             !options.is(TypeResolverContext::GenericRequirement)) ||
-            options.is(TypeResolverContext::ExplicitCastExpr)) {
-          Type SelfType = nominal->getSelfInterfaceType();
-          if (insideClass)
-            SelfType = DynamicSelfType::get(SelfType, ctx);
-          return resolution.mapTypeIntoContext(SelfType);
-        }
-
-        // Attempt to refer to 'Self' within a non-protocol nominal type.
         // Produce a Fix-It replacing 'Self' with the nominal type name.
         auto name = getDeclNameFromContext(dc, nominal);
         diags.diagnose(comp->getIdLoc(), diag::self_in_nominal, name)
@@ -1341,6 +1364,10 @@ resolveTopLevelIdentTypeComponent(TypeResolution resolution,
     if (options.contains(TypeResolutionFlags::SilenceErrors))
       return ErrorType::get(ctx);
 
+    if (id == ctx.Id_Self)
+      if (auto SelfType = SelfAllowedBySE0068(resolution, options))
+        return SelfType;
+
     return diagnoseUnknownType(resolution, nullptr, SourceRange(), comp,
                                options, lookupOptions);
   }

trunk/test/type/self.swift

@@ -46,6 +46,8 @@ final class FinalMario : Mario {
 // These references to Self are now possible (SE-0068)
 
 class A<T> {
+  typealias _Self = Self
+  // expected-error@-1 {{'Self' is only available in a protocol or as the result of a method in a class; did you mean 'A'?}}
   let b: Int
   required init(a: Int) {
     print("\(Self.self).\(#function)")
@@ -79,6 +81,13 @@ class A<T> {
     let copy = Self.init(a: 11)
     return copy
   }
+  subscript (i: Int) -> Self { // expected-error {{'Self' is only available in a protocol or as the result of a method in a class; did you mean 'A'?}}
+    get {
+      return Self.init(a: i)
+    }
+    set(newValue) {
+    }
+  }
 }
 
 class B: A<Int> {
@@ -164,6 +173,13 @@ extension S2 {
     return Self.init() as? Self
     // expected-warning@-1 {{conditional cast from 'S2' to 'S2' always succeeds}}
   }
+  subscript (i: Int) -> Self {
+    get {
+      return Self.init()
+    }
+    set(newValue) {
+    }
+  }
 }
 
 enum E {

trunk/utils/build-script-impl

@@ -2534,7 +2534,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     cmake_options+=(
                       -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
                       -DLLDB_CODESIGN_IDENTITY=""
-                      -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL=TRUE
+                      -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL="${LLDB_USE_SYSTEM_DEBUGSERVER}"
                       -DLLDB_FRAMEWORK_TOOLS="darwin-debug;lldb-argdumper;lldb-server;repl_swift"
                     )
                   fi