Merge pull request swiftlang#20512 from harlanhaskins/storage-wars

Author: swift-ci

include/swift/AST/Attr.def

@@ -245,9 +245,9 @@ CONTEXTUAL_SIMPLE_DECL_ATTR(override, Override,
   OnFunc | OnAccessor | OnVar | OnSubscript | OnConstructor | OnAssociatedType |
   DeclModifier |
   NotSerialized, 44)
-SIMPLE_DECL_ATTR(sil_stored, SILStored,
+SIMPLE_DECL_ATTR(_hasStorage, HasStorage,
   OnVar |
-  SILOnly |
+  UserInaccessible |
   NotSerialized, 45)
 DECL_ATTR(private, AccessControl,
   OnFunc | OnAccessor | OnExtension | OnGenericType | OnVar | OnSubscript |

lib/AST/ASTPrinter.cpp

@@ -2355,12 +2355,12 @@ static void printParameterFlags(ASTPrinter &printer, PrintOptions options,
 
 void PrintAST::visitVarDecl(VarDecl *decl) {
   printDocumentationComment(decl);
-  // Print @sil_stored when the attribute is not already
+  // Print @_hasStorage when the attribute is not already
   // on, decl has storage and it is on a class.
   if (Options.PrintForSIL && decl->hasStorage() &&
       isStructOrClassContext(decl->getDeclContext()) &&
-      !decl->getAttrs().hasAttribute<SILStoredAttr>())
-    Printer << "@sil_stored ";
+      !decl->getAttrs().hasAttribute<HasStorageAttr>())
+    Printer << "@_hasStorage ";
   printAttributes(decl);
   printAccess(decl);
   if (!Options.SkipIntroducerKeywords) {

lib/Parse/ParseDecl.cpp

@@ -4672,7 +4672,7 @@ Parser::parseDeclVarGetSet(Pattern *pattern, ParseDeclOptions Flags,
   }
 
   // Reject accessors on 'let's after parsing them (for better recovery).
-  if (PrimaryVar->isLet() && !Attributes.hasAttribute<SILStoredAttr>()) {
+  if (PrimaryVar->isLet() && !Attributes.hasAttribute<HasStorageAttr>()) {
     Diag<> DiagID;
     if (accessors.WillSet || accessors.DidSet)
       DiagID = diag::let_cannot_be_observing_property;
@@ -4935,9 +4935,9 @@ Parser::ParsedAccessors::classify(Parser &P, AbstractStorageDecl *storage,
     readWriteImpl = ReadWriteImplKind::Immutable;
   }
 
-  // Allow the sil_stored attribute to override all the accessors we parsed
+  // Allow the _hasStorage attribute to override all the accessors we parsed
   // when making the final classification.
-  if (attrs.hasAttribute<SILStoredAttr>()) {
+  if (attrs.hasAttribute<HasStorageAttr>()) {
     return StorageImplInfo::getSimpleStored(StorageIsMutable_t(Set != nullptr));
   }
 

lib/Sema/TypeCheckAttr.cpp

@@ -285,7 +285,7 @@ class AttributeEarlyChecker : public AttributeVisitor<AttributeEarlyChecker> {
   void visitAccessControlAttr(AccessControlAttr *attr);
   void visitSetterAccessAttr(SetterAccessAttr *attr);
   bool visitAbstractAccessControlAttr(AbstractAccessControlAttr *attr);
-  void visitSILStoredAttr(SILStoredAttr *attr);
+  void visitHasStorageAttr(HasStorageAttr *attr);
   void visitObjCMembersAttr(ObjCMembersAttr *attr);
 };
 } // end anonymous namespace
@@ -428,7 +428,7 @@ void AttributeEarlyChecker::visitGKInspectableAttr(GKInspectableAttr *attr) {
                                  attr->getAttrName());
 }
 
-void AttributeEarlyChecker::visitSILStoredAttr(SILStoredAttr *attr) {
+void AttributeEarlyChecker::visitHasStorageAttr(HasStorageAttr *attr) {
   auto *VD = cast<VarDecl>(D);
   if (VD->getDeclContext()->getSelfClassDecl())
     return;
@@ -819,6 +819,7 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
     IGNORED_ATTR(Exported)
     IGNORED_ATTR(ForbidSerializingReference)
     IGNORED_ATTR(GKInspectable)
+    IGNORED_ATTR(HasStorage)
     IGNORED_ATTR(IBDesignable)
     IGNORED_ATTR(IBInspectable)
     IGNORED_ATTR(IBOutlet) // checked early.
@@ -846,7 +847,6 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
     IGNORED_ATTR(Semantics)
     IGNORED_ATTR(ShowInInterface)
     IGNORED_ATTR(SILGenName)
-    IGNORED_ATTR(SILStored)
     IGNORED_ATTR(StaticInitializeObjCMetadata)
     IGNORED_ATTR(SynthesizedProtocol)
     IGNORED_ATTR(Testable)

lib/Sema/TypeCheckDeclOverride.cpp

@@ -1224,7 +1224,7 @@ namespace  {
     UNINTERESTING_ATTR(SynthesizedProtocol)
     UNINTERESTING_ATTR(RequiresStoredPropertyInits)
     UNINTERESTING_ATTR(Transparent)
-    UNINTERESTING_ATTR(SILStored)
+    UNINTERESTING_ATTR(HasStorage)
     UNINTERESTING_ATTR(Testable)
 
     UNINTERESTING_ATTR(WarnUnqualifiedAccess)

test/IRGen/access_markers.sil

@@ -4,8 +4,8 @@ import Builtin
 import Swift
 
 class A {
-  @sil_stored var property: Int { get set }
-  @sil_stored var exProperty: Any { get set }
+  @_hasStorage var property: Int { get set }
+  @_hasStorage var exProperty: Any { get set }
   deinit
   init()
 }

test/IRGen/class_stack_alloc.sil

@@ -4,24 +4,24 @@ import Builtin
 import Swift
 
 class TestClass {
-  @sil_stored var a : Int64
+  @_hasStorage var a : Int64
   init()
 }
 
 struct TestStruct {
-  @sil_stored var a : Int64
-  @sil_stored var b : Int64
-  @sil_stored var c : Int64
+  @_hasStorage var a : Int64
+  @_hasStorage var b : Int64
+  @_hasStorage var c : Int64
 }
 
 class BigClass {
-  @sil_stored var a : Int64
-  @sil_stored var b : Int64
-  @sil_stored var c : Int64
-  @sil_stored var d : Int64
-  @sil_stored var e : Int64
-  @sil_stored var f : Int64
-  @sil_stored var g : Int64
+  @_hasStorage var a : Int64
+  @_hasStorage var b : Int64
+  @_hasStorage var c : Int64
+  @_hasStorage var d : Int64
+  @_hasStorage var e : Int64
+  @_hasStorage var f : Int64
+  @_hasStorage var g : Int64
   init()
 }
 

test/IRGen/constant_struct_with_padding.sil

@@ -6,8 +6,8 @@ import Builtin
 import Swift
 
 struct T {
-  @sil_stored var a: Builtin.Int1 { get set }
-  @sil_stored var b: Builtin.Int32 { get set }
+  @_hasStorage var a: Builtin.Int1 { get set }
+  @_hasStorage var b: Builtin.Int32 { get set }
 }
 
 // CHECK: @global = hidden global %T4main1TV <{ i1 false, [3 x i8] undef, i32 0 }>, align 4

test/IRGen/exactcast.sil

@@ -9,7 +9,7 @@ import Swift
 import SwiftShims
 
 class Node {
-  @sil_stored var index: Int { get set }
+  @_hasStorage var index: Int { get set }
   init(index: Int)
   func check() -> Int
   @objc deinit

test/IRGen/exclusivity.sil

@@ -5,7 +5,7 @@ sil_stage canonical
 import Swift
 
 class A {
-   @sil_stored final var x: Int { get set }
+   @_hasStorage final var x: Int { get set }
    init(x: Int)
 }
 sil_vtable A {}