Skip to content

Commit 353e6fe

Browse files
authored
Merge pull request #35009 from atrick/remove-directdealloc
Remove SILArgumentConvention::Direct_Deallocating
2 parents d5d9e48 + f92009d commit 353e6fe

File tree

6 files changed

+0
-12
lines changed

6 files changed

+0
-12
lines changed

include/swift/SIL/SILArgumentConvention.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ struct SILArgumentConvention {
3232
Indirect_Out,
3333
Direct_Owned,
3434
Direct_Unowned,
35-
Direct_Deallocating,
3635
Direct_Guaranteed,
3736
} Value;
3837

@@ -86,7 +85,6 @@ struct SILArgumentConvention {
8685
case SILArgumentConvention::Indirect_Out:
8786
case SILArgumentConvention::Direct_Unowned:
8887
case SILArgumentConvention::Direct_Owned:
89-
case SILArgumentConvention::Direct_Deallocating:
9088
case SILArgumentConvention::Direct_Guaranteed:
9189
return false;
9290
}
@@ -105,7 +103,6 @@ struct SILArgumentConvention {
105103
case SILArgumentConvention::Indirect_Out:
106104
case SILArgumentConvention::Indirect_InoutAliasable:
107105
case SILArgumentConvention::Direct_Unowned:
108-
case SILArgumentConvention::Direct_Deallocating:
109106
return false;
110107
}
111108
llvm_unreachable("covered switch isn't covered?!");
@@ -123,7 +120,6 @@ struct SILArgumentConvention {
123120
case SILArgumentConvention::Indirect_InoutAliasable:
124121
case SILArgumentConvention::Direct_Unowned:
125122
case SILArgumentConvention::Direct_Owned:
126-
case SILArgumentConvention::Direct_Deallocating:
127123
return false;
128124
}
129125
llvm_unreachable("covered switch isn't covered?!");
@@ -143,7 +139,6 @@ struct SILArgumentConvention {
143139
case SILArgumentConvention::Direct_Unowned:
144140
case SILArgumentConvention::Direct_Guaranteed:
145141
case SILArgumentConvention::Direct_Owned:
146-
case SILArgumentConvention::Direct_Deallocating:
147142
return false;
148143
}
149144
llvm_unreachable("covered switch isn't covered?!");

lib/SIL/IR/SILValue.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,6 @@ ValueOwnershipKind::ValueOwnershipKind(const SILFunction &F, SILType Type,
216216
case SILArgumentConvention::Direct_Guaranteed:
217217
value = OwnershipKind::Guaranteed;
218218
return;
219-
case SILArgumentConvention::Direct_Deallocating:
220-
llvm_unreachable("Not handled");
221219
}
222220
}
223221

lib/SIL/Verifier/MemoryLifetime.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ void MemoryLifetimeVerifier::setFuncOperandBits(BlockState &state, Operand &op,
781781
case SILArgumentConvention::Indirect_InoutAliasable:
782782
case SILArgumentConvention::Direct_Owned:
783783
case SILArgumentConvention::Direct_Unowned:
784-
case SILArgumentConvention::Direct_Deallocating:
785784
case SILArgumentConvention::Direct_Guaranteed:
786785
break;
787786
}
@@ -968,7 +967,6 @@ void MemoryLifetimeVerifier::checkFuncArgument(Bits &bits, Operand &argumentOp,
968967
break;
969968
case SILArgumentConvention::Direct_Owned:
970969
case SILArgumentConvention::Direct_Unowned:
971-
case SILArgumentConvention::Direct_Deallocating:
972970
case SILArgumentConvention::Direct_Guaranteed:
973971
break;
974972
}

lib/SIL/Verifier/SILVerifier.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,6 @@ struct ImmutableAddressUseVerifier {
462462
case SILArgumentConvention::Direct_Unowned:
463463
case SILArgumentConvention::Direct_Guaranteed:
464464
case SILArgumentConvention::Direct_Owned:
465-
case SILArgumentConvention::Direct_Deallocating:
466465
assert(conv.isIndirectConvention() && "Expect an indirect convention");
467466
return true; // return something "conservative".
468467
}

lib/SILGen/SILGenBuilder.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ static ManagedValue createInputFunctionArgument(SILGenBuilder &B, SILType type,
447447
return ManagedValue::forLValue(arg);
448448
case SILArgumentConvention::Indirect_In_Constant:
449449
llvm_unreachable("Convention not produced by SILGen");
450-
case SILArgumentConvention::Direct_Deallocating:
451450
case SILArgumentConvention::Indirect_Out:
452451
llvm_unreachable("unsupported convention for API");
453452
}

lib/SILOptimizer/Mandatory/RawSILInstLowering.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ static void getAssignByWrapperArgsRecursively(SmallVectorImpl<SILValue> &args,
148148
case SILArgumentConvention::Indirect_Inout:
149149
case SILArgumentConvention::Indirect_InoutAliasable:
150150
case SILArgumentConvention::Indirect_Out:
151-
case SILArgumentConvention::Direct_Deallocating:
152151
llvm_unreachable("wrong convention for setter/initializer src argument");
153152
}
154153
args.push_back(src);

0 commit comments

Comments
 (0)