Merge pull request swiftlang#63522 from xedin/revert-type-wrappers

[AST/Sema/SIL] Revert TypeWrappers feature functionality

Author: xedin

include/swift/AST/Decl.h

@@ -35,7 +35,6 @@
 #include "swift/AST/StorageImpl.h"
 #include "swift/AST/TypeAlignments.h"
 #include "swift/AST/TypeWalker.h"
-#include "swift/AST/TypeWrappers.h"
 #include "swift/AST/Types.h"
 #include "swift/Basic/ArrayRefView.h"
 #include "swift/Basic/Compiler.h"
@@ -3978,35 +3977,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
     return getGlobalActorInstance() != nullptr;
   }
 
-  /// Returns true if this type has a type wrapper custom attribute.
-  bool hasTypeWrapper() const { return bool(getTypeWrapper()); }
-
-  /// Return a type wrapper (if any) associated with this type.
-  Optional<TypeWrapperInfo> getTypeWrapper() const;
-
-  /// If this declaration has a type wrapper return a property that
-  /// is used for all type wrapper related operations (mainly for
-  /// applicable property access routing).
-  VarDecl *getTypeWrapperProperty() const;
-
-  /// If this declaration has a type wrapper, return `$Storage`
-  /// declaration that contains all the stored properties managed
-  /// by the wrapper. Note that if this type is a protocol them
-  /// this method returns an associated type for $Storage.
-  TypeDecl *getTypeWrapperStorageDecl() const;
-
-  /// If this declaration is a type wrapper, retrieve
-  /// its required initializer - `init(storageWrapper:)`.
-  ConstructorDecl *getTypeWrapperInitializer() const;
-
-  /// Get an initializer that accepts a type wrapper instance to
-  /// initialize the wrapped type.
-  ConstructorDecl *getTypeWrappedTypeStorageInitializer() const;
-
-  /// Get a memberwise initializer that could be used to instantiate a
-  /// type wrapped type.
-  ConstructorDecl *getTypeWrappedTypeMemberwiseInitializer() const;
-
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) {
     return D->getKind() >= DeclKind::First_NominalTypeDecl &&
@@ -5872,17 +5842,6 @@ class VarDecl : public AbstractStorageDecl {
   /// wrapper that has storage.
   bool hasStorageOrWrapsStorage() const;
 
-  /// Whether this property belongs to a type wrapped type and has
-  /// all access to it routed through a type wrapper.
-  bool isAccessedViaTypeWrapper() const;
-
-  /// For type wrapped properties (see \c isAccessedViaTypeWrapper)
-  /// all access is routed through a type wrapper.
-  ///
-  /// \returns an underlying type wrapper property which is a
-  /// storage endpoint for all access to this property.
-  VarDecl *getUnderlyingTypeWrapperStorage() const;
-
   /// Visit all auxiliary declarations to this VarDecl.
   ///
   /// An auxiliary declaration is a declaration synthesized by the compiler to support
@@ -5960,11 +5919,6 @@ class VarDecl : public AbstractStorageDecl {
   /// backing property will be treated as the member-initialized property.
   bool isMemberwiseInitialized(bool preferDeclaredProperties) const;
 
-  /// Check whether this variable presents a local storage synthesized
-  /// by the compiler in a user-defined designated initializer to
-  /// support initialization of type wrapper managed properties.
-  bool isTypeWrapperLocalStorageForInitializer() const;
-
   /// Return the range of semantics attributes attached to this VarDecl.
   auto getSemanticsAttrs() const
       -> decltype(getAttrs().getAttributes<SemanticsAttr>()) {
@@ -7910,12 +7864,6 @@ class ConstructorDecl : public AbstractFunctionDecl {
   /// \endcode
   bool isObjCZeroParameterWithLongSelector() const;
 
-  /// If this is a user-defined constructor that belongs to
-  /// a type wrapped type return a local `_storage` variable
-  /// injected by the compiler for aid with type wrapper
-  /// initialization.
-  VarDecl *getLocalTypeWrapperStorageVar() const;
-
   static bool classof(const Decl *D) {
     return D->getKind() == DeclKind::Constructor;
   }

include/swift/AST/DiagnosticsSema.def

@@ -6748,85 +6748,6 @@ ERROR(move_expression_not_passed_lvalue,none,
 ERROR(borrow_expression_not_passed_lvalue,none,
       "'borrow' can only be applied to lvalues", ())
 
-//------------------------------------------------------------------------------
-// MARK: Type Wrappers
-//------------------------------------------------------------------------------
-
-ERROR(type_wrappers_are_experimental,none,
-      "type wrappers are an experimental feature", ())
-
-ERROR(type_wrapper_attribute_not_allowed_here,none,
-      "type wrapper attribute %0 can only be applied to a class, struct, or protocol",
-      (Identifier))
-
-ERROR(type_wrapper_requires_two_generic_params,none,
-      "type wrapper has to declare two generic parameters: "
-      "wrapped and storage types", ())
-
-ERROR(cannot_use_multiple_type_wrappers,none,
-      "%0 %1 cannot use more than one type wrapper",
-      (DescriptiveDeclKind, DeclName))
-
-NOTE(type_wrapper_inferred_from,none,
-     "type wrapper %0 inferred from %1 %2",
-     (DeclName, DescriptiveDeclKind, DeclName))
-
-ERROR(type_wrapper_requires_memberwise_init,none,
-      "type wrapper type %0 does not contain a required initializer"
-      " - init(for:storage:)",
-      (DeclName))
-
-ERROR(cannot_overload_type_wrapper_initializer,none,
-      "cannot overload type wrapper initializer 'init(for:storage:)'", ())
-
-ERROR(cannot_declare_type_wrapper_init_with_invalid_first_param,none,
-      "first parameter of type wrapper initializer should be wrapped type - %0", (Type))
-
-ERROR(cannot_declare_type_wrapper_init_with_invalid_second_param,none,
-      "second parameter of type wrapper initializer should be storage type - %0", (Type))
-
-ERROR(type_wrapper_requires_subscript,none,
-      "type wrapper type %0 does not contain a required subscript"
-      " - subscript(propertyKeyPath:storageKeyPath:)",
-      (DeclName))
-
-ERROR(type_wrapper_requires_readonly_subscript,none,
-      "type wrapper type %0 does not contain a required ready-only subscript",
-      (DeclName))
-
-ERROR(type_wrapper_requires_writable_subscript,none,
-      "type wrapper type %0 does not contain a required writable subscript",
-      (DeclName))
-
-NOTE(add_type_wrapper_subscript_stub_note,none,
-     "do you want to add a stub?", ())
-
-ERROR(type_wrapper_failable_init,none,
-      "type wrapper initializer %0 cannot be failable", (DeclName))
-
-ERROR(type_wrapper_subscript_invalid_parameter_type,none,
-      "type wrapper subscript parameter %0 expects type %1 (got: %2)",
-      (Identifier, Type, Type))
-
-ERROR(type_wrapper_subscript_invalid_keypath_parameter,none,
-      "type wrapper subscript parameter %0 expects a key path (got: %1)",
-      (Identifier, Type))
-
-ERROR(type_wrapper_type_requirement_not_accessible,none,
-      "%select{private|fileprivate|internal|package|public|open}0 %1 %2 cannot have "
-      "more restrictive access than its enclosing type wrapper type %3 "
-      "(which is %select{private|fileprivate|internal|package|public|open}4)",
-      (AccessLevel, DescriptiveDeclKind, DeclName, Type, AccessLevel))
-
-ERROR(type_wrapper_ignored_on_local_properties,none,
-      "%0 must not be used on local properties", (DeclAttribute))
-ERROR(type_wrapper_ignored_on_computed_properties,none,
-      "%0 must not be used on computed properties", (DeclAttribute))
-ERROR(type_wrapper_ignored_on_static_properties,none,
-      "%0 must not be used on static properties", (DeclAttribute))
-ERROR(type_wrapper_ignored_on_lazy_properties,none,
-      "%0 must not be used on lazy properties", (DeclAttribute))
-
 //------------------------------------------------------------------------------
 // MARK: #_hasSymbol
 //------------------------------------------------------------------------------

include/swift/AST/KnownIdentifiers.def

@@ -309,15 +309,6 @@ IDENTIFIER(decodeNextArgument)
 IDENTIFIER(SerializationRequirement)
 IDENTIFIER_WITH_NAME(builderSelf, "$builderSelf")
 
-// Type wrappers
-IDENTIFIER_WITH_NAME(TypeWrapperStorage, "$Storage")
-IDENTIFIER_WITH_NAME(TypeWrapperProperty, "$storage")
-IDENTIFIER(storageKeyPath)
-IDENTIFIER(propertyKeyPath)
-IDENTIFIER(wrappedSelf)
-IDENTIFIER(storageWrapper)
-IDENTIFIER_WITH_NAME(localStorageVar, "_storage")
-
 // Attribute options
 IDENTIFIER_(_always)
 IDENTIFIER_(assumed)