@@ -1240,12 +1240,12 @@ struct PartitionOpBuilder {
1240
1240
PartitionOp::Require (lookupValueID (value), currentInst));
1241
1241
}
1242
1242
1243
- void addRequireInOutSendingAtFunctionExit (SILValue value) {
1243
+ void addInOutSendingAtFunctionExit (SILValue value) {
1244
1244
assert (valueHasID (value, /* dumpIfHasNoID=*/ true ) &&
1245
1245
" required value should already have been encountered" );
1246
1246
currentInstPartitionOps.emplace_back (
1247
- PartitionOp::RequireInOutSendingAtFunctionExit (lookupValueID (value),
1248
- currentInst));
1247
+ PartitionOp::InOutSendingAtFunctionExit (lookupValueID (value),
1248
+ currentInst));
1249
1249
}
1250
1250
1251
1251
void addUnknownPatternError (SILValue value) {
@@ -2402,15 +2402,15 @@ class PartitionOpTranslator {
2402
2402
2403
2403
// / Adds requires for all sending inout parameters to make sure that they are
2404
2404
// / properly updated before the end of the function.
2405
- void addRequiresForInOutParameters (TermInst *inst) {
2405
+ void addEndOfFunctionChecksForInOutSendingParameters (TermInst *inst) {
2406
2406
assert (inst->isFunctionExiting () && " Must be function exiting term inst?!" );
2407
2407
for (auto *arg : inst->getFunction ()->getArguments ()) {
2408
2408
auto *fArg = cast<SILFunctionArgument>(arg);
2409
2409
if (fArg ->getArgumentConvention ().isInoutConvention () &&
2410
2410
fArg ->getKnownParameterInfo ().hasOption (SILParameterInfo::Sending)) {
2411
2411
if (auto ns = tryToTrackValue (arg)) {
2412
2412
auto rep = ns->getRepresentative ().getValue ();
2413
- builder.addRequireInOutSendingAtFunctionExit (rep);
2413
+ builder.addInOutSendingAtFunctionExit (rep);
2414
2414
}
2415
2415
}
2416
2416
}
@@ -2838,7 +2838,7 @@ CONSTANT_TRANSLATION(DynamicMethodBranchInst, TerminatorPhi)
2838
2838
#define FUNCTION_EXITING_TERMINATOR_CONSTANT (INST, Kind ) \
2839
2839
TranslationSemantics PartitionOpTranslator::visit##INST(INST *inst) { \
2840
2840
assert (inst->isFunctionExiting () && " Must be function exiting?!" ); \
2841
- addRequiresForInOutParameters (inst); \
2841
+ addEndOfFunctionChecksForInOutSendingParameters (inst); \
2842
2842
return TranslationSemantics::Kind; \
2843
2843
}
2844
2844
@@ -3090,7 +3090,7 @@ PartitionOpTranslator::visitLoadBorrowInst(LoadBorrowInst *lbi) {
3090
3090
}
3091
3091
3092
3092
TranslationSemantics PartitionOpTranslator::visitReturnInst (ReturnInst *ri) {
3093
- addRequiresForInOutParameters (ri);
3093
+ addEndOfFunctionChecksForInOutSendingParameters (ri);
3094
3094
if (ri->getFunction ()->getLoweredFunctionType ()->hasSendingResult ()) {
3095
3095
return TranslationSemantics::TransferringNoResult;
3096
3096
}
0 commit comments