@@ -1240,12 +1240,12 @@ struct PartitionOpBuilder {
12401240 PartitionOp::Require (lookupValueID (value), currentInst));
12411241 }
12421242
1243- void addRequireInOutSendingAtFunctionExit (SILValue value) {
1243+ void addInOutSendingAtFunctionExit (SILValue value) {
12441244 assert (valueHasID (value, /* dumpIfHasNoID=*/ true ) &&
12451245 " required value should already have been encountered" );
12461246 currentInstPartitionOps.emplace_back (
1247- PartitionOp::RequireInOutSendingAtFunctionExit (lookupValueID (value),
1248- currentInst));
1247+ PartitionOp::InOutSendingAtFunctionExit (lookupValueID (value),
1248+ currentInst));
12491249 }
12501250
12511251 void addUnknownPatternError (SILValue value) {
@@ -2402,15 +2402,15 @@ class PartitionOpTranslator {
24022402
24032403 // / Adds requires for all sending inout parameters to make sure that they are
24042404 // / properly updated before the end of the function.
2405- void addRequiresForInOutParameters (TermInst *inst) {
2405+ void addEndOfFunctionChecksForInOutSendingParameters (TermInst *inst) {
24062406 assert (inst->isFunctionExiting () && " Must be function exiting term inst?!" );
24072407 for (auto *arg : inst->getFunction ()->getArguments ()) {
24082408 auto *fArg = cast<SILFunctionArgument>(arg);
24092409 if (fArg ->getArgumentConvention ().isInoutConvention () &&
24102410 fArg ->getKnownParameterInfo ().hasOption (SILParameterInfo::Sending)) {
24112411 if (auto ns = tryToTrackValue (arg)) {
24122412 auto rep = ns->getRepresentative ().getValue ();
2413- builder.addRequireInOutSendingAtFunctionExit (rep);
2413+ builder.addInOutSendingAtFunctionExit (rep);
24142414 }
24152415 }
24162416 }
@@ -2838,7 +2838,7 @@ CONSTANT_TRANSLATION(DynamicMethodBranchInst, TerminatorPhi)
28382838#define FUNCTION_EXITING_TERMINATOR_CONSTANT (INST, Kind ) \
28392839 TranslationSemantics PartitionOpTranslator::visit##INST(INST *inst) { \
28402840 assert (inst->isFunctionExiting () && " Must be function exiting?!" ); \
2841- addRequiresForInOutParameters (inst); \
2841+ addEndOfFunctionChecksForInOutSendingParameters (inst); \
28422842 return TranslationSemantics::Kind; \
28432843 }
28442844
@@ -3090,7 +3090,7 @@ PartitionOpTranslator::visitLoadBorrowInst(LoadBorrowInst *lbi) {
30903090}
30913091
30923092TranslationSemantics PartitionOpTranslator::visitReturnInst (ReturnInst *ri) {
3093- addRequiresForInOutParameters (ri);
3093+ addEndOfFunctionChecksForInOutSendingParameters (ri);
30943094 if (ri->getFunction ()->getLoweredFunctionType ()->hasSendingResult ()) {
30953095 return TranslationSemantics::TransferringNoResult;
30963096 }
0 commit comments