Merge pull request #61421 from tshortli/enable-global-actors-by-default

Frontend: Enable `$GlobalActors` by default

Author: tshortli

include/swift/Basic/Features.def

@@ -64,10 +64,9 @@ LANGUAGE_FEATURE(AsyncAwait, 296, "async/await", true)
 LANGUAGE_FEATURE(EffectfulProp, 310, "Effectful properties", true)
 LANGUAGE_FEATURE(MarkerProtocol, 0, "@_marker protocol", true)
 LANGUAGE_FEATURE(Actors, 0, "actors", true)
-LANGUAGE_FEATURE(Actors2, 0, "actors #2 (TEMPORARY)", true)
 LANGUAGE_FEATURE(ConcurrentFunctions, 0, "@concurrent functions", true)
 LANGUAGE_FEATURE(RethrowsProtocol, 0, "@rethrows protocol", true)
-LANGUAGE_FEATURE(GlobalActors, 0, "Global actors", langOpts.EnableExperimentalConcurrency)
+LANGUAGE_FEATURE(GlobalActors, 316, "Global actors", true)
 LANGUAGE_FEATURE(BuiltinJob, 0, "Builtin.Job type", true)
 LANGUAGE_FEATURE(Sendable, 0, "Sendable and @Sendable", true)
 LANGUAGE_FEATURE(BuiltinExecutor, 0, "Builtin.Executor type", true)

lib/AST/ASTPrinter.cpp

@@ -2738,10 +2738,6 @@ static bool usesFeatureConcurrentFunctions(Decl *decl) {
   return false;
 }
 
-static bool usesFeatureActors2(Decl *decl) {
-  return false;
-}
-
 static bool usesFeatureSendable(Decl *decl) {
   if (auto func = dyn_cast<AbstractFunctionDecl>(decl)) {
     if (func->isSendable())
@@ -2844,17 +2840,6 @@ static bool usesFeatureRethrowsProtocol(Decl *decl) {
 }
 
 static bool usesFeatureGlobalActors(Decl *decl) {
-  if (auto nominal = dyn_cast<NominalTypeDecl>(decl)) {
-    if (nominal->getAttrs().hasAttribute<GlobalActorAttr>())
-      return true;
-  }
-
-  if (auto ext = dyn_cast<ExtensionDecl>(decl)) {
-    if (auto nominal = ext->getExtendedNominal())
-      if (usesFeatureGlobalActors(nominal))
-        return true;
-  }
-
   return false;
 }
 

lib/DependencyScan/DependencyScanningTool.cpp

@@ -92,8 +92,7 @@ void DependencyScannerDiagnosticCollectingConsumer::addDiagnostic(SourceManager
 
   std::string ResultingMessage;
   llvm::raw_string_ostream Stream(ResultingMessage);
-  const llvm::SourceMgr &rawSM = SM.getLLVMSourceMgr();
-  
+
   // Actually substitute the diagnostic arguments into the diagnostic text.
   llvm::SmallString<256> Text;
   llvm::raw_svector_ostream Out(Text);

lib/IRGen/GenStruct.cpp

@@ -326,10 +326,9 @@ namespace {
   };
 
   /// A type implementation for loadable record types imported from Clang.
-  class LoadableClangRecordTypeInfo final :
-    public StructTypeInfoBase<LoadableClangRecordTypeInfo, LoadableTypeInfo,
-                              ClangFieldInfo> {
-    IRGenModule &IGM;
+  class LoadableClangRecordTypeInfo final
+      : public StructTypeInfoBase<LoadableClangRecordTypeInfo, LoadableTypeInfo,
+                                  ClangFieldInfo> {
     const clang::RecordDecl *ClangDecl;
 
     template <class Fn>
@@ -356,14 +355,14 @@ namespace {
 
   public:
     LoadableClangRecordTypeInfo(ArrayRef<ClangFieldInfo> fields,
-                                unsigned explosionSize, IRGenModule &IGM,
-                                llvm::Type *storageType, Size size,
-                                SpareBitVector &&spareBits, Alignment align,
+                                unsigned explosionSize, llvm::Type *storageType,
+                                Size size, SpareBitVector &&spareBits,
+                                Alignment align,
                                 const clang::RecordDecl *clangDecl)
         : StructTypeInfoBase(StructTypeInfoKind::LoadableClangRecordTypeInfo,
                              fields, explosionSize, storageType, size,
                              std::move(spareBits), align, IsPOD, IsFixedSize),
-          IGM(IGM), ClangDecl(clangDecl) {}
+          ClangDecl(clangDecl) {}
 
     TypeLayoutEntry *buildTypeLayoutEntry(IRGenModule &IGM,
                                           SILType T) const override {
@@ -1049,7 +1048,7 @@ class ClangRecordLowering {
           FieldInfos, llvmType, TotalStride, TotalAlignment, ClangDecl);
     }
     return LoadableClangRecordTypeInfo::create(
-        FieldInfos, NextExplosionIndex, IGM, llvmType, TotalStride,
+        FieldInfos, NextExplosionIndex, llvmType, TotalStride,
         std::move(SpareBits), TotalAlignment, ClangDecl);
   }
 

test/ModuleInterface/features.swift

@@ -125,13 +125,6 @@ extension Array: FeatureTest.MP where Element : FeatureTest.MP { }
 extension OldSchool: UnsafeSendable { }
 // CHECK-NEXT: }
 
-// CHECK: #if compiler(>=5.3) && $GlobalActors
-// CHECK-NEXT: @globalActor public struct SomeGlobalActor
-@globalActor
-public struct SomeGlobalActor {
-  public static let shared = MyActor()
-}
-
 
 // CHECK: #if compiler(>=5.3) && $AsyncAwait
 // CHECK-NEXT: func runSomethingSomewhere
@@ -196,7 +189,3 @@ public func unavailableFromAsyncFunc() { }
 public func noAsyncFunc() { }
 
 // CHECK-NOT: extension FeatureTest.MyActor : Swift.Sendable
-
-// CHECK: #if compiler(>=5.3) && $GlobalActors
-// CHECK-NEXT: extension FeatureTest.SomeGlobalActor : _Concurrency.GlobalActor {}
-// CHECK-NEXT: #endif

test/ModuleInterface/global-actor.swift

@@ -1,20 +1,56 @@
 // RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name Test
+// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name Test
+// RUN: %FileCheck %s < %t.swiftinterface
+
 // REQUIRES: concurrency
 
-import MeowActor
+// Global actors are no longer protected with a feature guard.
+// CHECK-NOT: $GlobalActors
+
+// CHECK: @globalActor public struct GlobalActor {
+@available(SwiftStdlib 5.1, *)
+@globalActor public struct GlobalActor {
+  public actor Actor { }
+  public static let shared = Actor()
+}
 
+// CHECK: @Test.GlobalActor public func funcBoundToGlobalActor()
 @available(SwiftStdlib 5.1, *)
-@MeowActor func doMeow() {}
+@GlobalActor public func funcBoundToGlobalActor() { }
 
-// RUN: %target-swift-frontend  -disable-availability-checking -enable-library-evolution -emit-module -o %t/MeowActor.swiftmodule %S/Inputs/MeowActor.swift
-// RUN: %target-swift-frontend  -disable-availability-checking -emit-silgen %s -I %t | %FileCheck --check-prefix CHECK-RESILIENT %s
-// CHECK-RESILIENT: metatype $@thick MeowActor.Type
+// CHECK: public func funcWithParameterBoundToGlobalActor(_ x: Test.ClassBoundToGlobalActor)
+@available(SwiftStdlib 5.1, *)
+public func funcWithParameterBoundToGlobalActor(_ x: ClassBoundToGlobalActor) { }
 
-// RUN: %target-swift-frontend  -disable-availability-checking -emit-module -o %t/MeowActor.swiftmodule %S/Inputs/MeowActor.swift
-// RUN: %target-swift-frontend  -disable-availability-checking -emit-silgen %s -I %t | %FileCheck --check-prefix CHECK-FRAGILE %s
-// CHECK-FRAGILE: metatype $@thin MeowActor.Type
+// CHECK: @Test.GlobalActor public class ClassBoundToGlobalActor
+@available(SwiftStdlib 5.1, *)
+@GlobalActor public class ClassBoundToGlobalActor { }
 
+// CHECK: extension Test.ClassBoundToGlobalActor
 @available(SwiftStdlib 5.1, *)
-func someFunc() async {
-  await doMeow()
-}
+extension ClassBoundToGlobalActor {
+  public func someMethod() { }
+}
+
+// CHECK: @Test.GlobalActor public class DerivedFromClassBoundToGlobalActor : Test.ClassBoundToGlobalActor
+@available(SwiftStdlib 5.1, *)
+public class DerivedFromClassBoundToGlobalActor: ClassBoundToGlobalActor {}
+
+// CHECK: public class NoActorClass
+@available(SwiftStdlib 5.1, *)
+public class NoActorClass {
+  // CHECK: @Test.GlobalActor public var varBoundToGlobalActor: Swift.Int
+  @GlobalActor public var varBoundToGlobalActor: Int
+  
+  // CHECK: @Test.GlobalActor public init()
+  @GlobalActor public init() {
+    self.varBoundToGlobalActor = 0
+  }
+
+  // CHECK: @Test.GlobalActor public func methodBoundToGlobalActor()
+  @GlobalActor public func methodBoundToGlobalActor() { }
+}
+
+// CHECK: extension Test.GlobalActor : _Concurrency.GlobalActor {}
+// CHECK: extension Test.ClassBoundToGlobalActor : Swift.Sendable {}

test/ModuleInterface/Inputs/MeowActor.swift renamed to test/SILGen/Inputs/MeowActor.swift

@@ -0,0 +1,20 @@
+// RUN: %empty-directory(%t)
+// REQUIRES: concurrency
+
+import MeowActor
+
+@available(SwiftStdlib 5.1, *)
+@MeowActor func doMeow() {}
+
+// RUN: %target-swift-frontend  -disable-availability-checking -enable-library-evolution -emit-module -o %t/MeowActor.swiftmodule %S/Inputs/MeowActor.swift
+// RUN: %target-swift-frontend  -disable-availability-checking -emit-silgen %s -I %t | %FileCheck --check-prefix CHECK-RESILIENT %s
+// CHECK-RESILIENT: metatype $@thick MeowActor.Type
+
+// RUN: %target-swift-frontend  -disable-availability-checking -emit-module -o %t/MeowActor.swiftmodule %S/Inputs/MeowActor.swift
+// RUN: %target-swift-frontend  -disable-availability-checking -emit-silgen %s -I %t | %FileCheck --check-prefix CHECK-FRAGILE %s
+// CHECK-FRAGILE: metatype $@thin MeowActor.Type
+
+@available(SwiftStdlib 5.1, *)
+func someFunc() async {
+  await doMeow()
+}