Skip to content

Commit 4c8f943

Browse files
committed
[AST/Serialization] Remove isCallerIsolated bit from ParamDecl
This was used primarily by the printer and doesn't work when `nonisolated(nonsending)` is inferred, so let's remove it.
1 parent 8ea8a99 commit 4c8f943

File tree

5 files changed

+1
-19
lines changed

5 files changed

+1
-19
lines changed

include/swift/AST/Decl.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7334,18 +7334,6 @@ class ParamDecl : public VarDecl {
73347334
removeFlag(Flag::IsSending);
73357335
}
73367336

7337-
/// Whether or not this parameter is marked with 'nonisolated(nonsending)'.
7338-
bool isCallerIsolated() const {
7339-
return getOptions().contains(Flag::IsCallerIsolated);
7340-
}
7341-
7342-
void setCallerIsolated(bool value = true) {
7343-
if (value)
7344-
addFlag(Flag::IsCallerIsolated);
7345-
else
7346-
removeFlag(Flag::IsCallerIsolated);
7347-
}
7348-
73497337
/// Whether or not this parameter is marked with '@_addressable'.
73507338
bool isAddressable() const {
73517339
return getOptions().contains(Flag::IsAddressable);

lib/AST/Decl.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9204,7 +9204,6 @@ void ParamDecl::setTypeRepr(TypeRepr *repr) {
92049204

92059205
if (auto *callerIsolated =
92069206
dyn_cast<CallerIsolatedTypeRepr>(unwrappedType)) {
9207-
setCallerIsolated(true);
92089207
unwrappedType = callerIsolated->getBase();
92099208
continue;
92109209
}

lib/Serialization/Deserialization.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4222,7 +4222,6 @@ class DeclDeserializer {
42224222
bool isIsolated;
42234223
bool isCompileTimeLiteral, isConstValue;
42244224
bool isSending;
4225-
bool isCallerIsolated;
42264225
bool isAddressable;
42274226
uint8_t rawDefaultArg;
42284227
TypeID defaultExprType;
@@ -4236,7 +4235,6 @@ class DeclDeserializer {
42364235
isCompileTimeLiteral,
42374236
isConstValue,
42384237
isSending,
4239-
isCallerIsolated,
42404238
isAddressable,
42414239
rawDefaultArg,
42424240
defaultExprType,
@@ -4283,7 +4281,6 @@ class DeclDeserializer {
42834281
param->setCompileTimeLiteral(isCompileTimeLiteral);
42844282
param->setConstValue(isConstValue);
42854283
param->setSending(isSending);
4286-
param->setCallerIsolated(isCallerIsolated);
42874284
param->setAddressable(isAddressable);
42884285

42894286
// Decode the default argument kind.

lib/Serialization/ModuleFormat.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
5858
/// describe what change you made. The content of this comment isn't important;
5959
/// it just ensures a conflict if two people change the module format.
6060
/// Don't worry about adhering to the 80-column limit for this line.
61-
const uint16_t SWIFTMODULE_VERSION_MINOR = 973; // @export attribute
61+
const uint16_t SWIFTMODULE_VERSION_MINOR = 974; // remove 'isCallerIsolated' bit from ParamDecl
6262

6363
/// A standard hash seed used for all string hashes in a serialized module.
6464
///
@@ -1763,7 +1763,6 @@ namespace decls_block {
17631763
BCFixed<1>, // isCompileTimeLiteral?
17641764
BCFixed<1>, // isConst?
17651765
BCFixed<1>, // isSending?
1766-
BCFixed<1>, // isCallerIsolated?
17671766
BCFixed<1>, // isAddressable?
17681767
DefaultArgumentField, // default argument kind
17691768
TypeIDField, // default argument type

lib/Serialization/Serialization.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4808,7 +4808,6 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
48084808
param->isCompileTimeLiteral(),
48094809
param->isConstVal(),
48104810
param->isSending(),
4811-
param->isCallerIsolated(),
48124811
param->isAddressable(),
48134812
getRawStableDefaultArgumentKind(argKind),
48144813
S.addTypeRef(defaultExprType),

0 commit comments

Comments
 (0)