---

yaml
---
r: 349084
b: refs/heads/master
c: 23db8d0
h: refs/heads/master

Author: compnerd

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 033e31d3cb67f90cb8fdfd44a28811741a719d00
+refs/heads/master: 23db8d0e2ecc997462c8fefdeb3d3a1a6a7bec10
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/CMakeLists.txt

@@ -11,8 +11,6 @@ endif()
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-set(CMAKE_DISABLE_IN_SOURCE_BUILD YES)
-
 if(DEFINED CMAKE_JOB_POOLS)
   # CMake < 3.11 doesn't support CMAKE_JOB_POOLS. Manually set the property.
   set_property(GLOBAL PROPERTY JOB_POOLS "${CMAKE_JOB_POOLS}")

trunk/docs/WindowsBuild.md

@@ -99,7 +99,8 @@ mklink "%VCToolsInstallDir%\include\visualc.apinotes" S:\swift\stdlib\public\Pla
 Warning: Creating the above links usually requires administrator privileges. The quick and easy way to do this is to open a second developer prompt by right clicking whatever shortcut you used to open the first one, choosing Run As Administrator, and pasting the above commands into the resulting window. You can then close the privileged prompt; this is the only step which requires elevation.
 
 ## 6. Build LLVM/Clang
-- This must be done from within a developer command prompt. Make sure that the build
+- This must be done from within a developer command prompt. LLVM and Clang are
+  large projects, so building might take a few hours. Make sure that the build
   type for LLVM/Clang is compatible with the build type for Swift. That is,
   either build everything `Debug` or some variant of `Release` (e.g. `Release`,
   `RelWithDebInfo`).
@@ -125,8 +126,8 @@ ninja
 path S:\b\llvm\bin;%PATH%
 ```
 ## 7. Build CMark
-- This must be done from within a developer command prompt.
-
+- This must be done from within a developer command prompt. CMark is a fairly
+  small project and should only take a few minutes to build.
 ```cmd
 md "S:\b\cmark"
 cd "S:\b\cmark"
@@ -179,8 +180,8 @@ cmake -G "Visual Studio 2017" -A x64 -T "host=x64"^ ...
 ```
 
 ## 9. Build lldb
-- This must be done from within a developer command prompt.
-
+- This must be done from within a developer command prompt and could take hours
+  depending on your system.
 ```cmd
 md "S:\b\lldb"
 cd "S:\b\lldb"

trunk/include/swift/AST/Decl.h

@@ -2978,6 +2978,9 @@ class TypeAliasDecl : public GenericTypeDecl {
   /// Retrieve a sugared interface type containing the structure of the interface
   /// type before any semantic validation has occured.
   Type getStructuralType() const;
+
+  /// Set the interface type of this typealias declaration from the underlying type.
+  void computeType();
 
   bool isCompatibilityAlias() const {
     return Bits.TypeAliasDecl.IsCompatibilityAlias;
@@ -3166,6 +3169,10 @@ class AssociatedTypeDecl : public AbstractTypeParamDecl {
     TrailingWhere = trailingWhereClause;
   }
 
+  /// Set the interface type of this associated type declaration to a dependent
+  /// member type of 'Self'.
+  void computeType();
+
   /// Retrieve the associated type "anchor", which is the associated type
   /// declaration that will be used to describe this associated type in the
   /// ABI.
@@ -3355,6 +3362,10 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
     Bits.NominalTypeDecl.AddedImplicitInitializers = true;
   }
 
+  /// Set the interface type of this nominal type to the metatype of the
+  /// declared interface type.
+  void computeType();
+
   /// getDeclaredType - Retrieve the type declared by this entity, without
   /// any generic parameters bound if this is a generic type.
   Type getDeclaredType() const;
@@ -5473,6 +5484,10 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
   TypeLoc &getElementTypeLoc() { return ElementTy; }
   const TypeLoc &getElementTypeLoc() const { return ElementTy; }
 
+  /// Compute the interface type of this subscript from the parameter and
+  /// element types.
+  void computeType();
+
   /// Determine the kind of Objective-C subscripting this declaration
   /// implies.
   ObjCSubscriptKind getObjCSubscriptKind() const;
@@ -6343,6 +6358,10 @@ class EnumElementDecl : public DeclContext, public ValueDecl {
     return hasName() ? getBaseName().getIdentifier().str() : "_";
   }
 
+  /// Set the interface type of this enum element to the constructor function
+  /// type; (Self.Type) -> Self or (Self.Type) -> (Args...) -> Self.
+  void computeType();
+
   Type getArgumentInterfaceType() const;
 
   void setParameterList(ParameterList *params);

trunk/include/swift/AST/DiagnosticsCommon.def

@@ -163,11 +163,6 @@ ERROR(circular_protocol_def,none,
 NOTE(kind_declname_declared_here,none,
      "%0 %1 declared here", (DescriptiveDeclKind, DeclName))
 
-WARNING(warn_property_wrapper_module_scope,none,
-        "ignoring associated type %0 in favor of module-scoped property "
-        "wrapper %0; please qualify the reference with %1",
-        (DeclName, Identifier))
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

trunk/include/swift/AST/TypeCheckRequests.h

@@ -1362,29 +1362,6 @@ class ParamSpecifierRequest
   void cacheResult(ParamSpecifier value) const;
 };
 
-/// Determines the result type of a function or element type of a subscript.
-class ResultTypeRequest
-    : public SimpleRequest<ResultTypeRequest,
-                           Type(ValueDecl *),
-                           CacheKind::SeparatelyCached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  TypeLoc &getResultTypeLoc() const;
-
-  // Evaluation.
-  llvm::Expected<Type> evaluate(Evaluator &evaluator, ValueDecl *decl) const;
-
-public:
-  // Separate caching.
-  bool isCached() const { return true; }
-  Optional<Type> getCachedResult() const;
-  void cacheResult(Type value) const;
-};
-
 // Allow AnyValue to compare two Type values, even though Type doesn't
 // support ==.
 template<>

trunk/include/swift/AST/TypeCheckerTypeIDZone.def

@@ -153,5 +153,3 @@ SWIFT_REQUEST(TypeChecker, NeedsNewVTableEntryRequest,
               bool(AbstractFunctionDecl *), SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ParamSpecifierRequest,
               ParamDecl::Specifier(ParamDecl *), SeparatelyCached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, ResultTypeRequest,
-              Type(ValueDecl *), SeparatelyCached, NoLocationInfo)

trunk/include/swift/Sema/IDETypeChecking.h

@@ -20,31 +20,21 @@
 #define SWIFT_SEMA_IDETYPECHECKING_H
 
 #include "llvm/ADT/MapVector.h"
-#include "swift/AST/Identifier.h"
 #include "swift/Basic/SourceLoc.h"
 #include <memory>
 
 namespace swift {
   class AbstractFunctionDecl;
-  class ASTContext;
-  class ConcreteDeclRef;
   class Decl;
-  class DeclContext;
-  class DeclName;
-  enum class DeclRefKind;
   class Expr;
   class ExtensionDecl;
-  class FunctionType;
-  class NominalTypeDecl;
-  class PatternBindingDecl;
   class ProtocolDecl;
-  class SourceFile;
-  class SubscriptDecl;
-  class TopLevelCodeDecl;
   class Type;
   class TypeChecker;
+  class DeclContext;
+  class ConcreteDeclRef;
   class ValueDecl;
-  struct PrintOptions;
+  class DeclName;
 
   /// Typecheck binding initializer at \p bindingIndex.
   void typeCheckPatternBinding(PatternBindingDecl *PBD, unsigned bindingIndex);
@@ -137,6 +127,12 @@ namespace swift {
   /// \returns true on success, false on error.
   bool typeCheckTopLevelCodeDecl(TopLevelCodeDecl *TLCD);
 
+  /// Creates a type checker instance on the given AST context, if it
+  /// doesn't already have one.
+  ///
+  /// \returns a reference to the type checker instance.
+  TypeChecker &createTypeChecker(ASTContext &Ctx);
+
   struct ExtensionInfo {
     // The extension with the declarations to apply.
     ExtensionDecl *Ext;

trunk/include/swift/Subsystems.h

@@ -65,7 +65,6 @@ namespace swift {
   class SyntaxParsingCache;
   class Token;
   class TopLevelContext;
-  class TypeChecker;
   struct TypeLoc;
   class UnifiedStatsReporter;
   enum class SourceFileKind;
@@ -195,12 +194,6 @@ namespace swift {
     SkipNonInlinableFunctionBodies = 1 << 4,
   };
 
-  /// Creates a type checker instance on the given AST context, if it
-  /// doesn't already have one.
-  ///
-  /// \returns a reference to the type checker instance.
-  TypeChecker &createTypeChecker(ASTContext &Ctx);
-
   /// Once parsing and name-binding are complete, this walks the AST to resolve
   /// types and diagnose problems therein.
   ///