Merge pull request #71229 from sophiapoirier/remove-IsolatedAttr

sophiapoirier · web-flow · commit a2a8bca31246 · 2024-01-30T11:09:30.000-08:00
remove unused declaration attribute IsolatedAttr
diff --git a/include/swift/AST/Attr.def b/include/swift/AST/Attr.def
@@ -521,9 +521,6 @@ SIMPLE_DECL_ATTR(rethrows, Rethrows,
 CONTEXTUAL_SIMPLE_DECL_ATTR(indirect, Indirect,
   DeclModifier | OnEnum | OnEnumElement | ABIBreakingToAdd | ABIBreakingToRemove | APIStableToAdd | APIStableToRemove,
   60)
-CONTEXTUAL_SIMPLE_DECL_ATTR(isolated, Isolated,
-  DeclModifier | OnParam | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
-  103)
 CONTEXTUAL_SIMPLE_DECL_ATTR(async, Async,
   DeclModifier | OnVar | OnFunc | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
   106)
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -160,7 +160,6 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   IGNORED_ATTR(AtReasync)
   IGNORED_ATTR(ImplicitSelfCapture)
   IGNORED_ATTR(InheritActorContext)
-  IGNORED_ATTR(Isolated)
   IGNORED_ATTR(Preconcurrency)
   IGNORED_ATTR(BackDeployed)
   IGNORED_ATTR(Documentation)
diff --git a/lib/Sema/TypeCheckDeclOverride.cpp b/lib/Sema/TypeCheckDeclOverride.cpp
@@ -1612,7 +1612,6 @@ namespace  {
     UNINTERESTING_ATTR(Nonisolated)
     UNINTERESTING_ATTR(ImplicitSelfCapture)
     UNINTERESTING_ATTR(InheritActorContext)
-    UNINTERESTING_ATTR(Isolated)
     UNINTERESTING_ATTR(NoImplicitCopy)
     UNINTERESTING_ATTR(UnavailableFromAsync)
 
diff --git a/lib/Serialization/ModuleFormat.h b/lib/Serialization/ModuleFormat.h
@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 843; // add OSLog string encoding
+const uint16_t SWIFTMODULE_VERSION_MINOR = 844; // remove IsolatedAttr
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
diff --git a/test/Parse/macro_decl.swift b/test/Parse/macro_decl.swift
@@ -44,7 +44,7 @@ func test() {
   dynamic #someFunc
 
   @CustomAttr
-  isolated #someFunc
+  #someFunc
 }
 
 public # someFunc // expected-error {{extraneous whitespace between '#' and macro name is not permitted}} {{9-10=}}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func test() {`
`44`	`44`	`dynamic #someFunc`
`45`	`45`
`46`	`46`	`@CustomAttr`
`47`		`- isolated #someFunc`
	`47`	`+ #someFunc`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public # someFunc // expected-error {{extraneous whitespace between '#' and macro name is not permitted}} {{9-10=}}`