@@ -1239,7 +1239,7 @@ class AddressMaterialization {
12391239 return storage.storageAddress ;
12401240 }
12411241
1242- void initializeOperand (Operand *operand);
1242+ void initializeComposingUse (Operand *operand);
12431243
12441244 SILValue recursivelyMaterializeStorage (ValueStorage &storage,
12451245 bool intoPhiOperand);
@@ -1269,7 +1269,7 @@ class AddressMaterialization {
12691269// /
12701270// / If the operand projects into its use, then the memory was already
12711271// / initialized when visiting the use.
1272- void AddressMaterialization::initializeOperand (Operand *operand) {
1272+ void AddressMaterialization::initializeComposingUse (Operand *operand) {
12731273 SILValue def = operand->get ();
12741274 if (def->getType ().isAddressOnly (*pass.function )) {
12751275 ValueStorage &storage = pass.valueStorageMap .getStorage (def);
@@ -2903,7 +2903,7 @@ class DefRewriter : SILInstructionVisitor<DefRewriter> {
29032903 void visitEnumInst (EnumInst *enumInst) {
29042904 if (enumInst->hasOperand ()) {
29052905 // Handle operands here because loadable operands must also be copied.
2906- addrMat.initializeOperand (&enumInst->getOperandRef ());
2906+ addrMat.initializeComposingUse (&enumInst->getOperandRef ());
29072907 }
29082908 SILValue enumAddr = addrMat.materializeAddress (enumInst);
29092909
@@ -2916,7 +2916,7 @@ class DefRewriter : SILInstructionVisitor<DefRewriter> {
29162916 InitExistentialValueInst *initExistentialValue) {
29172917
29182918 // Initialize memory for the operand which may be opaque or loadable.
2919- addrMat.initializeOperand (&initExistentialValue->getOperandRef ());
2919+ addrMat.initializeComposingUse (&initExistentialValue->getOperandRef ());
29202920 }
29212921
29222922 // Project an opaque value out of a box-type existential.
@@ -2948,15 +2948,15 @@ class DefRewriter : SILInstructionVisitor<DefRewriter> {
29482948 // For each element, initialize the operand's memory. Some struct elements
29492949 // may be loadable types.
29502950 for (Operand &operand : structInst->getAllOperands ())
2951- addrMat.initializeOperand (&operand);
2951+ addrMat.initializeComposingUse (&operand);
29522952 }
29532953
29542954 // Define an opaque tuple.
29552955 void visitTupleInst (TupleInst *tupleInst) {
29562956 // For each element, initialize the operand's memory. Some tuple elements
29572957 // may be loadable types.
29582958 for (Operand &operand : tupleInst->getAllOperands ())
2959- addrMat.initializeOperand (&operand);
2959+ addrMat.initializeComposingUse (&operand);
29602960 }
29612961};
29622962} // end anonymous namespace
0 commit comments