diff options
Diffstat (limited to 'llvm/lib/Transforms')
| -rw-r--r-- | llvm/lib/Transforms/IPO/LowerTypeTests.cpp | 9 | ||||
| -rw-r--r-- | llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp | 19 |
2 files changed, 18 insertions, 10 deletions
diff --git a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp index 8a6238259fb..062b872376e 100644 --- a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp +++ b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp @@ -265,7 +265,7 @@ class LowerTypeTestsModule { /// regular LTO or the regular LTO phase of ThinLTO), or indirectly using type /// identifier summaries and external symbol references (in ThinLTO backends). struct TypeIdLowering { - TypeTestResolution::Kind TheKind; + TypeTestResolution::Kind TheKind = TypeTestResolution::Unsat; /// All except Unsat: the start address within the combined global. Constant *OffsetedGlobal; @@ -700,7 +700,7 @@ void LowerTypeTestsModule::buildBitSetsFromGlobalVariables( /// information about the type identifier. void LowerTypeTestsModule::exportTypeId(StringRef TypeId, const TypeIdLowering &TIL) { - TypeTestResolution &TTRes = Summary->getTypeIdSummary(TypeId).TTRes; + TypeTestResolution &TTRes = Summary->getOrInsertTypeIdSummary(TypeId).TTRes; TTRes.TheKind = TIL.TheKind; auto ExportGlobal = [&](StringRef Name, Constant *C) { @@ -738,7 +738,10 @@ void LowerTypeTestsModule::exportTypeId(StringRef TypeId, LowerTypeTestsModule::TypeIdLowering LowerTypeTestsModule::importTypeId(StringRef TypeId) { - TypeTestResolution &TTRes = Summary->getTypeIdSummary(TypeId).TTRes; + const TypeIdSummary *TidSummary = Summary->getTypeIdSummary(TypeId); + if (!TidSummary) + return {}; // Unsat: no globals match this type id. + const TypeTestResolution &TTRes = TidSummary->TTRes; TypeIdLowering TIL; TIL.TheKind = TTRes.TheKind; diff --git a/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp b/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp index ba44921d4d5..68d7bd56813 100644 --- a/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp +++ b/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp @@ -1196,9 +1196,14 @@ void DevirtModule::scanTypeCheckedLoadUsers(Function *TypeCheckedLoadFunc) { } void DevirtModule::importResolution(VTableSlot Slot, VTableSlotInfo &SlotInfo) { - const WholeProgramDevirtResolution &Res = - Summary->getTypeIdSummary(cast<MDString>(Slot.TypeID)->getString()) - .WPDRes[Slot.ByteOffset]; + const TypeIdSummary *TidSummary = + Summary->getTypeIdSummary(cast<MDString>(Slot.TypeID)->getString()); + if (!TidSummary) + return; + auto ResI = TidSummary->WPDRes.find(Slot.ByteOffset); + if (ResI == TidSummary->WPDRes.end()) + return; + const WholeProgramDevirtResolution &Res = ResI->second; if (Res.TheKind == WholeProgramDevirtResolution::SingleImpl) { // The type of the function in the declaration is irrelevant because every @@ -1354,10 +1359,10 @@ bool DevirtModule::run() { S.first.ByteOffset)) { WholeProgramDevirtResolution *Res = nullptr; if (Action == PassSummaryAction::Export && isa<MDString>(S.first.TypeID)) - Res = - &Summary - ->getTypeIdSummary(cast<MDString>(S.first.TypeID)->getString()) - .WPDRes[S.first.ByteOffset]; + Res = &Summary + ->getOrInsertTypeIdSummary( + cast<MDString>(S.first.TypeID)->getString()) + .WPDRes[S.first.ByteOffset]; if (!trySingleImplDevirt(TargetsForSlot, S.second, Res) && tryVirtualConstProp(TargetsForSlot, S.second, Res, S.first)) |
