@@ -1239,7 +1239,7 @@ class AddressMaterialization {
1239
1239
return storage.storageAddress ;
1240
1240
}
1241
1241
1242
- void initializeOperand (Operand *operand);
1242
+ void initializeComposingUse (Operand *operand);
1243
1243
1244
1244
SILValue recursivelyMaterializeStorage (ValueStorage &storage,
1245
1245
bool intoPhiOperand);
@@ -1269,7 +1269,7 @@ class AddressMaterialization {
1269
1269
// /
1270
1270
// / If the operand projects into its use, then the memory was already
1271
1271
// / initialized when visiting the use.
1272
- void AddressMaterialization::initializeOperand (Operand *operand) {
1272
+ void AddressMaterialization::initializeComposingUse (Operand *operand) {
1273
1273
SILValue def = operand->get ();
1274
1274
if (def->getType ().isAddressOnly (*pass.function )) {
1275
1275
ValueStorage &storage = pass.valueStorageMap .getStorage (def);
@@ -2903,7 +2903,7 @@ class DefRewriter : SILInstructionVisitor<DefRewriter> {
2903
2903
void visitEnumInst (EnumInst *enumInst) {
2904
2904
if (enumInst->hasOperand ()) {
2905
2905
// Handle operands here because loadable operands must also be copied.
2906
- addrMat.initializeOperand (&enumInst->getOperandRef ());
2906
+ addrMat.initializeComposingUse (&enumInst->getOperandRef ());
2907
2907
}
2908
2908
SILValue enumAddr = addrMat.materializeAddress (enumInst);
2909
2909
@@ -2916,7 +2916,7 @@ class DefRewriter : SILInstructionVisitor<DefRewriter> {
2916
2916
InitExistentialValueInst *initExistentialValue) {
2917
2917
2918
2918
// Initialize memory for the operand which may be opaque or loadable.
2919
- addrMat.initializeOperand (&initExistentialValue->getOperandRef ());
2919
+ addrMat.initializeComposingUse (&initExistentialValue->getOperandRef ());
2920
2920
}
2921
2921
2922
2922
// Project an opaque value out of a box-type existential.
@@ -2948,15 +2948,15 @@ class DefRewriter : SILInstructionVisitor<DefRewriter> {
2948
2948
// For each element, initialize the operand's memory. Some struct elements
2949
2949
// may be loadable types.
2950
2950
for (Operand &operand : structInst->getAllOperands ())
2951
- addrMat.initializeOperand (&operand);
2951
+ addrMat.initializeComposingUse (&operand);
2952
2952
}
2953
2953
2954
2954
// Define an opaque tuple.
2955
2955
void visitTupleInst (TupleInst *tupleInst) {
2956
2956
// For each element, initialize the operand's memory. Some tuple elements
2957
2957
// may be loadable types.
2958
2958
for (Operand &operand : tupleInst->getAllOperands ())
2959
- addrMat.initializeOperand (&operand);
2959
+ addrMat.initializeComposingUse (&operand);
2960
2960
}
2961
2961
};
2962
2962
} // end anonymous namespace
0 commit comments