averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

IRGen: Fix a map entry use-after-free issue in LargeLoadableHeuristic

Browse Source 
rdar://139398409
This commit is contained in:
Arnold Schwaighofer
2024-11-07 09:46:37 -08:00
parent fe6703b0a8
commit d925eefdba
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/IRGen/LoadableByAddress.cpp
View File

@@ -3519,7 +3519,7 @@ private:
"Expected only two categories: address and object");
assert(!canType->hasTypeParameter());
auto &entry = largeTypeProperties[ty];
auto entry = largeTypeProperties[ty];
auto cached = entry.getNumRegisters();
if (cached)
return cached;
@@ -3532,6 +3532,7 @@ private:
auto explosionSchema = TI.getSchema();
auto res = std::max(nativeSchemaOrigParam.size(), explosionSchema.size());
entry.setNumRegisters(res);
largeTypeProperties[ty] = entry;
return entry.getNumRegisters();
}
@@ -3545,15 +3546,18 @@ void LargeLoadableHeuristic::visit(SILArgument *arg) {
if (numRegisters(objType) < NumRegistersLargeType)
return;
auto &entry = largeTypeProperties[objType];
auto entry = largeTypeProperties[objType];
for (auto *use : arg->getUses()) {
auto *usr = use->getUser();
switch (usr->getKind()) {
case SILInstructionKind::TupleExtractInst:
case SILInstructionKind::StructExtractInst: {
auto projectionTy = cast<SingleValueInstruction>(usr)->getType();
if (numRegisters(projectionTy) >= NumRegistersLargeType)
if (numRegisters(projectionTy) >= NumRegistersLargeType) {
entry.addProjection();
largeTypeProperties[objType] = entry;
}
break;
}
default:
@@ -3575,8 +3579,9 @@ void LargeLoadableHeuristic::visit(SILInstruction *i) {
auto resTy = bitcast->getType();
if (numRegisters(resTy) > NumRegistersLargeType) {
// Force the source type to be indirect.
auto &entry = largeTypeProperties[opdTy];
auto entry = largeTypeProperties[opdTy];
entry.setNumRegisters(65535);
largeTypeProperties[opdTy] = entry;
return;
}
}
@@ -3589,7 +3594,7 @@ void LargeLoadableHeuristic::visit(SILInstruction *i) {
if (registerCount < NumRegistersLargeType)
continue;
auto &entry = largeTypeProperties[objType];
auto entry = largeTypeProperties[objType];
switch (i->getKind()) {
case SILInstructionKind::TupleExtractInst:
@@ -3639,6 +3644,8 @@ void LargeLoadableHeuristic::visit(SILInstruction *i) {
entry.addUse();
break;
}
largeTypeProperties[objType] = entry;
}
}