Rename SIL's @isolated attribute to @sil_isolated.

rjmccall · rjmccall · commit f7052ce5a4b1 · 2024-02-02T16:24:15.000-05:00
We want to use @isolated in ordinary Swift, and while we could probably make it coexist with this SIL use, doing so would be really inconvenient.
diff --git a/include/swift/AST/TypeAttr.def b/include/swift/AST/TypeAttr.def
@@ -103,7 +103,7 @@ SIMPLE_SIL_TYPE_ATTR(yield_many, YieldMany)
 SIMPLE_SIL_TYPE_ATTR(captures_generics, CapturesGenerics)
 // Used at the SIL level to mark a type as moveOnly.
 SIMPLE_SIL_TYPE_ATTR(moveOnly, MoveOnly)
-SIMPLE_SIL_TYPE_ATTR(isolated, Isolated)
+SIMPLE_SIL_TYPE_ATTR(sil_isolated, SILIsolated)
 
 // SIL metatype attributes.
 SIMPLE_SIL_TYPE_ATTR(thin, Thin)
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -8084,7 +8084,7 @@ void SILParameterInfo::print(ASTPrinter &Printer,
 
   if (options.contains(SILParameterInfo::Isolated)) {
     options -= SILParameterInfo::Isolated;
-    Printer << "@isolated ";
+    Printer << "@sil_isolated ";
   }
 
   // If we did not handle a case in Options, this code was not updated
diff --git a/lib/ASTGen/Sources/ASTGen/TypeAttrs.swift b/lib/ASTGen/Sources/ASTGen/TypeAttrs.swift
@@ -102,11 +102,11 @@ extension ASTGenVisitor {
         .inGuaranteed,
         .inout,
         .inoutAliasable,
-        .isolated,
         .moveOnly,
         .objCMetatype,
         .out,
         .owned,
+        .silIsolated,
         .silUnmanaged,
         .silUnowned,
         .silWeak,
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -4432,7 +4432,7 @@ SILParameterInfo TypeResolver::resolveSILParameter(
         parameterOptions |= SILParameterInfo::NotDifferentiable;
         return true;
 
-      case TypeAttrKind::Isolated:
+      case TypeAttrKind::SILIsolated:
         parameterOptions |= SILParameterInfo::Isolated;
         return true;
 
diff --git a/test/SILOptimizer/definite_init_actor.swift b/test/SILOptimizer/definite_init_actor.swift
@@ -13,15 +13,15 @@ func arbitraryAsync() async {}
 
 actor BoringActor {
 
-    // CHECK-LABEL: sil hidden @$s4test11BoringActorCACyYacfc : $@convention(method) @async (@isolated @owned BoringActor) -> @owned BoringActor {
+    // CHECK-LABEL: sil hidden @$s4test11BoringActorCACyYacfc : $@convention(method) @async (@sil_isolated @owned BoringActor) -> @owned BoringActor {
     // CHECK:   bb0([[SELF:%[0-9]+]] : $BoringActor):
     // CHECK:       initializeDefaultActor
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
     // CHECK-NEXT:  hop_to_executor [[EI]]
     // CHECK: } // end sil function '$s4test11BoringActorCACyYacfc'
     init() async {}
 
-    // CHECK-LABEL: sil hidden @$s4test11BoringActorC4sizeACSi_tYacfc : $@convention(method) @async (Int, @isolated @owned BoringActor) -> @owned BoringActor {
+    // CHECK-LABEL: sil hidden @$s4test11BoringActorC4sizeACSi_tYacfc : $@convention(method) @async (Int, @sil_isolated @owned BoringActor) -> @owned BoringActor {
     // CHECK:   bb0({{%[0-9]+}} : $Int, [[SELF:%[0-9]+]] : $BoringActor):
     // CHECK:       initializeDefaultActor
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
@@ -47,15 +47,15 @@ actor BoringActor {
       await arbitraryAsync()
     }
 
-    // CHECK-LABEL: sil hidden @$s4test11BoringActorC6crashyACSgyt_tYacfc : $@convention(method) @async (@isolated @owned BoringActor) -> @owned Optional<BoringActor> {
+    // CHECK-LABEL: sil hidden @$s4test11BoringActorC6crashyACSgyt_tYacfc : $@convention(method) @async (@sil_isolated @owned BoringActor) -> @owned Optional<BoringActor> {
     // CHECK:   bb0([[SELF:%[0-9]+]] : $BoringActor):
     // CHECK:       initializeDefaultActor
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
     // CHECK-NEXT:  hop_to_executor [[EI]]
     // CHECK: } // end sil function '$s4test11BoringActorC6crashyACSgyt_tYacfc'
     init!(crashy: Void) async { return nil }
 
-    // CHECK-LABEL: sil hidden @$s4test11BoringActorC5nillyACSgSi_tYacfc : $@convention(method) @async (Int, @isolated @owned BoringActor) -> @owned Optional<BoringActor> {
+    // CHECK-LABEL: sil hidden @$s4test11BoringActorC5nillyACSgSi_tYacfc : $@convention(method) @async (Int, @sil_isolated @owned BoringActor) -> @owned Optional<BoringActor> {
     // CHECK:   bb0({{%[0-9]+}} : $Int, [[SELF:%[0-9]+]] : $BoringActor):
     // CHECK:       initializeDefaultActor
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
@@ -73,7 +73,7 @@ actor BoringActor {
      myVar = 0
    }
 
-    // CHECK-LABEL: sil hidden @$s4test14SingleVarActorCACyYacfc : $@convention(method) @async (@isolated @owned SingleVarActor) -> @owned SingleVarActor {
+    // CHECK-LABEL: sil hidden @$s4test14SingleVarActorCACyYacfc : $@convention(method) @async (@sil_isolated @owned SingleVarActor) -> @owned SingleVarActor {
     // CHECK:    bb0([[SELF:%[0-9]+]] : $SingleVarActor):
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
     // CHECK:       store {{%[0-9]+}} to [[ACCESS:%[0-9]+]]
@@ -86,7 +86,7 @@ actor BoringActor {
         myVar = 1
     }
 
-    // CHECK-LABEL: sil hidden @$s4test14SingleVarActorC10iterationsACSi_tYacfc : $@convention(method) @async (Int, @isolated @owned SingleVarActor) -> @owned SingleVarActor {
+    // CHECK-LABEL: sil hidden @$s4test14SingleVarActorC10iterationsACSi_tYacfc : $@convention(method) @async (Int, @sil_isolated @owned SingleVarActor) -> @owned SingleVarActor {
     // CHECK:   bb0({{%[0-9]+}} : $Int, [[SELF:%[0-9]+]] : $SingleVarActor):
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
     // CHECK:       [[MYVAR_REF:%[0-9]+]] = ref_element_addr [[EI]] : $SingleVarActor, #SingleVarActor.myVar
@@ -103,7 +103,7 @@ actor BoringActor {
         } while iter > 0
     }
 
-    // CHECK-LABEL: sil hidden @$s4test14SingleVarActorC2b12b2ACSb_SbtYacfc : $@convention(method) @async (Bool, Bool, @isolated @owned SingleVarActor) -> @owned SingleVarActor {
+    // CHECK-LABEL: sil hidden @$s4test14SingleVarActorC2b12b2ACSb_SbtYacfc : $@convention(method) @async (Bool, Bool, @sil_isolated @owned SingleVarActor) -> @owned SingleVarActor {
     // CHECK:   bb0({{%[0-9]+}} : $Bool, {{%[0-9]+}} : $Bool, [[SELF:%[0-9]+]] : $SingleVarActor):
 
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
@@ -130,7 +130,7 @@ actor BoringActor {
         myVar = 2
     }
 
-   // CHECK-LABEL: sil hidden @$s4test14SingleVarActorC14failable_asyncACSgSb_tYacfc : $@convention(method) @async (Bool, @isolated @owned SingleVarActor) -> @owned Optional<SingleVarActor> {
+   // CHECK-LABEL: sil hidden @$s4test14SingleVarActorC14failable_asyncACSgSb_tYacfc : $@convention(method) @async (Bool, @sil_isolated @owned SingleVarActor) -> @owned Optional<SingleVarActor> {
    // CHECK: bb0({{%[0-9]+}} : $Bool, {{%[0-9]+}} : $SingleVarActor):
    // CHECK:   cond_br {{%[0-9]+}}, [[SUCCESS_BB:bb[0-9]+]], {{bb[0-9]+}}
    //
@@ -177,15 +177,15 @@ actor DefaultInit {
     var y: String = ""
     var z: ActingError<Int> = .smuggledValue(5)
 
-    // CHECK-LABEL: sil hidden @$s4test11DefaultInitCACyYacfc : $@convention(method) @async (@isolated @owned DefaultInit) -> @owned DefaultInit {
+    // CHECK-LABEL: sil hidden @$s4test11DefaultInitCACyYacfc : $@convention(method) @async (@sil_isolated @owned DefaultInit) -> @owned DefaultInit {
     // CHECK:   bb0([[SELF:%[0-9]+]] : $DefaultInit):
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
     // CHECK:       store {{%[0-9]+}} to {{%[0-9]+}} : $*ActingError<Int>
     // CHECK-NEXT:  hop_to_executor [[EI]] : $DefaultInit
     // CHECK: } // end sil function '$s4test11DefaultInitCACyYacfc'
     init() async {}
 
-    // CHECK-LABEL: sil hidden @$s4test11DefaultInitC5nillyACSgSb_tYacfc : $@convention(method) @async (Bool, @isolated @owned DefaultInit) -> @owned Optional<DefaultInit> {
+    // CHECK-LABEL: sil hidden @$s4test11DefaultInitC5nillyACSgSb_tYacfc : $@convention(method) @async (Bool, @sil_isolated @owned DefaultInit) -> @owned Optional<DefaultInit> {
     // CHECK:   bb0({{%[0-9]+}} : $Bool, [[SELF:%[0-9]+]] : $DefaultInit):
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
     // CHECK:       store {{%[0-9]+}} to {{%[0-9]+}} : $*ActingError<Int>
@@ -203,7 +203,7 @@ actor MultiVarActor {
     var firstVar: Int
     var secondVar: Float
 
-    // CHECK-LABEL: sil hidden @$s4test13MultiVarActorC10doNotThrowACSb_tYaKcfc : $@convention(method) @async (Bool, @isolated @owned MultiVarActor) -> (@owned MultiVarActor, @error any Error) {
+    // CHECK-LABEL: sil hidden @$s4test13MultiVarActorC10doNotThrowACSb_tYaKcfc : $@convention(method) @async (Bool, @sil_isolated @owned MultiVarActor) -> (@owned MultiVarActor, @error any Error) {
     // CHECK:   bb0({{%[0-9]+}} : $Bool, [[SELF:%[0-9]+]] : $MultiVarActor):
     // CHECK:       [[EI:%.*]] = end_init_let_ref [[SELF]]
     // CHECK:       [[REF:%[0-9]+]] = ref_element_addr [[EI]] : $MultiVarActor, #MultiVarActor.firstVar
@@ -218,7 +218,7 @@ actor MultiVarActor {
         firstVar = 1
     }
 
-    // CHECK-LABEL: sil hidden @$s4test13MultiVarActorC10noSuccCaseACSb_tYacfc : $@convention(method) @async (Bool, @isolated @owned MultiVarActor) -> @owned MultiVarActor {
+    // CHECK-LABEL: sil hidden @$s4test13MultiVarActorC10noSuccCaseACSb_tYacfc : $@convention(method) @async (Bool, @sil_isolated @owned MultiVarActor) -> @owned MultiVarActor {
     // CHECK:       store {{%[0-9]+}} to [[A1:%[0-9]+]] : $*Int
     // CHECK-NEXT:  end_access [[A1]]
     // CHECK-NEXT:  hop_to_executor {{%[0-9]+}} : $MultiVarActor
@@ -235,7 +235,7 @@ actor MultiVarActor {
         firstVar = 2
     }
 
-    // CHECK-LABEL: sil hidden @$s4test13MultiVarActorC10noPredCaseACSb_tYacfc : $@convention(method) @async (Bool, @isolated @owned MultiVarActor) -> @owned MultiVarActor {
+    // CHECK-LABEL: sil hidden @$s4test13MultiVarActorC10noPredCaseACSb_tYacfc : $@convention(method) @async (Bool, @sil_isolated @owned MultiVarActor) -> @owned MultiVarActor {
     // CHECK:       store {{%[0-9]+}} to [[ACCESS:%[0-9]+]] : $*Int
     // CHECK-NEXT:  end_access [[ACCESS]]
     // CHECK-NEXT:  hop_to_executor {{%[0-9]+}} : $MultiVarActor
@@ -282,7 +282,7 @@ actor TaskMaster {
     func sayHello() { print("hello") }
 
     ////// for the initializer
-    // CHECK-LABEL: @$s4test10TaskMasterCACyYacfc : $@convention(method) @async (@isolated @owned TaskMaster) -> @owned TaskMaster {
+    // CHECK-LABEL: @$s4test10TaskMasterCACyYacfc : $@convention(method) @async (@sil_isolated @owned TaskMaster) -> @owned TaskMaster {
     // CHECK:           [[ELM:%[0-9]+]] = ref_element_addr [[SELF:%[0-9]+]] : $TaskMaster, #TaskMaster.task
     // CHECK:           [[NIL:%[0-9]+]] = enum $Optional<Task<(), Never>>, #Optional.none!enumelt
     // CHECK:           store [[NIL]] to [[ELM]] : $*Optional<Task<(), Never>>
@@ -301,7 +301,7 @@ actor TaskMaster {
 actor SomeActor {
     var x: Int = 0
 
-    // CHECK-LABEL: sil hidden @$s4test9SomeActorCACyYacfc : $@convention(method) @async (@isolated @owned SomeActor) -> @owned SomeActor {
+    // CHECK-LABEL: sil hidden @$s4test9SomeActorCACyYacfc : $@convention(method) @async (@sil_isolated @owned SomeActor) -> @owned SomeActor {
     // CHECK-NOT:       begin_access
     // CHECK:           store {{%[0-9]+}} to {{%[0-9]+}} : $*Int
     // CHECK-NEXT:      hop_to_executor {{%[0-9]+}} : $SomeActor

Original file line number	Diff line number	Diff line change
`@@ -8084,7 +8084,7 @@ void SILParameterInfo::print(ASTPrinter &Printer,`
`8084`	`8084`
`8085`	`8085`	`if (options.contains(SILParameterInfo::Isolated)) {`
`8086`	`8086`	`options -= SILParameterInfo::Isolated;`
`8087`		`- Printer << "@isolated ";`
	`8087`	`+ Printer << "@sil_isolated ";`
`8088`	`8088`	`}`
`8089`	`8089`
`8090`	`8090`	`// If we did not handle a case in Options, this code was not updated`