Merge remote-tracking branch 'upstream/master' into init-kind-request

Author: hborla

CMakeLists.txt

@@ -61,6 +61,10 @@ option(SWIFT_BUILD_STATIC_SDK_OVERLAY
     "Build static variants of the Swift SDK overlay"
     FALSE)
 
+option(SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT
+    "If not building stdlib, controls whether to build 'stdlib/toolchain' content"
+    TRUE)
+
 # In many cases, the CMake build system needs to determine whether to include
 # a directory, or perform other actions, based on whether the stdlib or SDK is
 # being built at all -- statically or dynamically. Please note that these
@@ -1078,7 +1082,9 @@ endif()
 if(SWIFT_BUILD_STDLIB)
   add_subdirectory(stdlib)
 else()
-  add_subdirectory(stdlib/toolchain)
+  if(SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT)
+    add_subdirectory(stdlib/toolchain)
+  endif()
 
   # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
   # ensure we build that when building tools.

docs/SwiftFormat.md

@@ -0,0 +1,56 @@
+
+# Swift-indent
+
+## Introduction
+
+Note: This tool is still a work in progress.
+
+swift-indent is a tool for automatically indenting your Swift files according to a
+set of rules. It is implemented as another driver kind, like swiftc, the batch
+compiler, so swift-indent is actually a symbolic link to swift. This tool uses
+libIDE to indent code, so it can be leveraged from multiple systems and editors.
+
+## Usage
+
+To print all the available options:
+
+     swift-indent -help
+
+By default, swift-indent will output the indented file to the standard output:
+
+     swift-indent sample.swift
+
+You can either output the result to a separate file:
+
+     swift-indent sample.swift -o result.swift
+
+Or you can indent in-place (the original file will be overwritten):
+
+     swift-indent -in-place sample.swift
+
+If you want to indent using tabs instead of spaces, use the `-use-tabs` option:
+
+     swift-indent -use-tabs sample.swift
+
+You can set the number of tabs or spaces using the `-tab-width` and
+`-indent-width` options, respectively.
+
+If you want to indent cases in switch statements, use the "-indent-switch-case"
+option. The result would be something like this:
+
+    switch aSwitch {
+      case .some(let s):
+        print(s)
+
+swift-indent supports indenting a range of lines from a file:
+
+     swift-indent -line-range 2:45 sample.swift
+
+This will indent the file from lines 2 to 45, inclusive.
+
+You can indent several files, but the `-line-range` option is not supported in
+that case.
+
+You can also provide several line ranges by using multiple `-line-range` options:
+
+     swift-indent -line-range 2:45 -line-range 100:120 sample.swift

docs/SwiftIndent.md

@@ -23,5 +23,6 @@ SWIFT_TYPEID(Type)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
 SWIFT_TYPEID(PropertyWrapperTypeInfo)
 SWIFT_TYPEID(CtorInitializerKind)
+SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>, PropertyWrapperMutability)
 SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
 SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)

include/swift/AST/ASTTypeIDZone.def

@@ -25,6 +25,7 @@ class NominalTypeDecl;
 struct PropertyWrapperBackingPropertyInfo;
 struct PropertyWrapperTypeInfo;
 enum class CtorInitializerKind;
+struct PropertyWrapperMutability;
 class Type;
 class VarDecl;
 class TypeAliasDecl;

include/swift/AST/ASTTypeIDs.h

@@ -79,6 +79,7 @@ namespace swift {
   struct PrintOptions;
   struct PropertyWrapperBackingPropertyInfo;
   struct PropertyWrapperTypeInfo;
+  struct PropertyWrapperMutability;
   class ProtocolDecl;
   class ProtocolType;
   struct RawComment;
@@ -5062,6 +5063,11 @@ class VarDecl : public AbstractStorageDecl {
   PropertyWrapperBackingPropertyInfo
       getPropertyWrapperBackingPropertyInfo() const;
 
+  /// Retrieve information about the mutability of the composed
+  /// property wrappers.
+  Optional<PropertyWrapperMutability>
+      getPropertyWrapperMutability() const;
+
   /// Retrieve the backing storage property for a property that has an
   /// attached property wrapper.
   ///

include/swift/AST/Decl.h

@@ -4481,8 +4481,9 @@ ERROR(property_wrapper_attribute_not_on_property, none,
 NOTE(property_wrapper_declared_here,none,
      "property wrapper type %0 declared here", (DeclName))
 
-ERROR(property_wrapper_composition_not_implemented, none,
-      "multiple property wrappers are not supported", ())
+ERROR(property_wrapper_mutating_get_composed_to_get_only,none,
+      "property wrapper %0 with a mutating getter cannot be composed inside "
+      "get-only property wrapper %1", (Type, Type))
 
 ERROR(property_wrapper_local,none,
       "property wrappers are not yet supported on local properties", ())

include/swift/AST/DiagnosticsSema.def

@@ -77,6 +77,47 @@ struct PropertyWrapperTypeInfo {
   }
 };
 
+/// Describes the mutability of the operations on a property wrapper or composition.
+struct PropertyWrapperMutability {
+  enum Value: uint8_t {
+    Nonmutating = 0,
+    Mutating = 1,
+    DoesntExist = 2,
+  };
+  
+  Value Getter, Setter;
+  
+  /// Get the mutability of a composed access chained after accessing a wrapper with `this`
+  /// getter and setter mutability.
+  Value composeWith(Value x) {
+    switch (x) {
+    case DoesntExist:
+      return DoesntExist;
+    
+    // If an operation is nonmutating, then its input relies only on the
+    // mutating-ness of the outer wrapper's get operation.
+    case Nonmutating:
+      return Getter;
+        
+    // If it's mutating, then it relies
+    // on a) the outer wrapper having a setter to exist at all, and b) the
+    // mutating-ness of either the getter or setter, since we need both to
+    // perform a writeback cycle.
+    case Mutating:
+      if (Setter == DoesntExist) {
+        return DoesntExist;
+      }
+      return std::max(Getter, Setter);
+    }
+  }
+  
+  bool operator==(PropertyWrapperMutability other) const {
+    return Getter == other.Getter && Setter == other.Setter;
+  }
+};
+
+void simple_display(llvm::raw_ostream &os, PropertyWrapperMutability m);
+
 /// Describes the backing property of a property that has an attached wrapper.
 struct PropertyWrapperBackingPropertyInfo {
   /// The backing property.

include/swift/AST/PropertyWrappers.h

@@ -32,6 +32,7 @@ namespace swift {
 class AbstractStorageDecl;
 class GenericParamList;
 struct PropertyWrapperBackingPropertyInfo;
+struct PropertyWrapperMutability;
 class RequirementRepr;
 class SpecializeAttr;
 class TypeAliasDecl;
@@ -601,6 +602,26 @@ class PropertyWrapperBackingPropertyTypeRequest :
   bool isCached() const;
 };
 
+/// Request information about the mutability of composed property wrappers.
+class PropertyWrapperMutabilityRequest :
+    public SimpleRequest<PropertyWrapperMutabilityRequest,
+                         Optional<PropertyWrapperMutability> (VarDecl *),
+                         CacheKind::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<Optional<PropertyWrapperMutability>>
+  evaluate(Evaluator &evaluator, VarDecl *var) const;
+
+public:
+  // Caching
+  bool isCached() const;
+};
+
 /// Request information about the backing property for properties that have
 /// attached property wrappers.
 class PropertyWrapperBackingPropertyInfoRequest :

include/swift/AST/TypeCheckRequests.h

@@ -33,6 +33,7 @@ SWIFT_TYPEID(StructuralTypeRequest)
 SWIFT_TYPEID(DefaultTypeRequest)
 SWIFT_TYPEID(MangleLocalTypeDeclRequest)
 SWIFT_TYPEID(PropertyWrapperTypeInfoRequest)
+SWIFT_TYPEID(PropertyWrapperMutabilityRequest)
 SWIFT_TYPEID(AttachedPropertyWrappersRequest)
 SWIFT_TYPEID(AttachedPropertyWrapperTypeRequest)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyTypeRequest)
@@ -47,4 +48,4 @@ SWIFT_TYPEID(LazyStoragePropertyRequest)
 SWIFT_TYPEID(TypeCheckFunctionBodyUntilRequest)
 SWIFT_TYPEID(StoredPropertiesRequest)
 SWIFT_TYPEID(StoredPropertiesAndMissingMembersRequest)
-SWIFT_TYPEID(StorageImplInfoRequest)
+SWIFT_TYPEID(StorageImplInfoRequest)

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -165,6 +165,14 @@ namespace llvm {
   bool operator!=(const TinyPtrVector<T> &lhs, const TinyPtrVector<T> &rhs) {
     return !(lhs == rhs);
   }
+
+  template<typename T>
+  void simple_display(raw_ostream &out, const Optional<T> &opt) {
+    if (opt) {
+      simple_display(out, *opt);
+    }
+    out << "None";
+  }
 } // end namespace llvm
 
 #endif //

include/swift/Basic/AnyValue.h

@@ -158,7 +158,7 @@ class Driver {
     Interactive,     // swift
     Batch,           // swiftc
     AutolinkExtract, // swift-autolink-extract
-    SwiftFormat      // swift-format
+    SwiftIndent      // swift-indent
   };
 
   class InputInfoMap;

include/swift/Driver/Driver.h

@@ -1,4 +1,4 @@
-//===--- Formatting.h -------------------------------------------*- C++ -*-===//
+//===--- Indenting.h --------------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_FORMATTING_H
-#define SWIFT_FORMATTING_H
+#ifndef SWIFT_INDENTING_H
+#define SWIFT_INDENTING_H
 
 namespace swift {
 namespace ide {
@@ -101,4 +101,4 @@ std::pair<LineRange, std::string> reformat(LineRange Range,
 } // namespace ide
 } // namespace swift
 
-#endif // LLVM_SWIFT_FORMATTING_H
+#endif // SWIFT_INDENTING_H

include/swift/IDE/Formatting.h renamed to include/swift/IDE/Indenting.h

@@ -33,7 +33,7 @@ namespace options {
     DoesNotAffectIncrementalBuild = (1 << 8),
     AutolinkExtractOption = (1 << 9),
     ModuleWrapOption = (1 << 10),
-    SwiftFormatOption = (1 << 11),
+    SwiftIndentOption = (1 << 11),
     ArgumentIsPath = (1 << 12),
     ModuleInterfaceOption = (1 << 13),
   };