From 7b55066a3485103a1ad4a7b316c1bd383156c223 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Fri, 22 Feb 2019 19:30:38 +0000 Subject: [PATCH] MIR: Preserve incoming frame index numbers Don't skip incrementing the frame index number if the object is dead. Instructions can still be referencing the old frame index number, and this doesn't attempt to remap those. The resulting MIR then fails to load because the use instructions use a higher frame index number than recorded list of stack objects. I'm not sure it's possible to craft a testcase with the existing set of passes. It requires selectively marking some stack objects dead in an essentially random order. StackSlotColoring condenses towards the low indexes. This avoids a regression in a future AMDGPU commit when some frame indexes are lowered separately from PEI. llvm-svn: 354688 --- llvm/lib/CodeGen/MIRPrinter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/CodeGen/MIRPrinter.cpp b/llvm/lib/CodeGen/MIRPrinter.cpp index 7939256..5977ba4 100644 --- a/llvm/lib/CodeGen/MIRPrinter.cpp +++ b/llvm/lib/CodeGen/MIRPrinter.cpp @@ -351,7 +351,7 @@ void MIRPrinter::convertStackObjects(yaml::MachineFunction &YMF, const TargetRegisterInfo *TRI = MF.getSubtarget().getRegisterInfo(); // Process fixed stack objects. unsigned ID = 0; - for (int I = MFI.getObjectIndexBegin(); I < 0; ++I) { + for (int I = MFI.getObjectIndexBegin(); I < 0; ++I, ++ID) { if (MFI.isDeadObjectIndex(I)) continue; @@ -368,12 +368,12 @@ void MIRPrinter::convertStackObjects(yaml::MachineFunction &YMF, YamlObject.IsAliased = MFI.isAliasedObjectIndex(I); YMF.FixedStackObjects.push_back(YamlObject); StackObjectOperandMapping.insert( - std::make_pair(I, FrameIndexOperand::createFixed(ID++))); + std::make_pair(I, FrameIndexOperand::createFixed(ID))); } // Process ordinary stack objects. ID = 0; - for (int I = 0, E = MFI.getObjectIndexEnd(); I < E; ++I) { + for (int I = 0, E = MFI.getObjectIndexEnd(); I < E; ++I, ++ID) { if (MFI.isDeadObjectIndex(I)) continue; @@ -394,7 +394,7 @@ void MIRPrinter::convertStackObjects(yaml::MachineFunction &YMF, YMF.StackObjects.push_back(YamlObject); StackObjectOperandMapping.insert(std::make_pair( - I, FrameIndexOperand::create(YamlObject.Name.Value, ID++))); + I, FrameIndexOperand::create(YamlObject.Name.Value, ID))); } for (const auto &CSInfo : MFI.getCalleeSavedInfo()) { -- 2.7.4