diff options
author | Adrian Prantl <aprantl@apple.com> | 2013-07-09 20:28:37 +0000 |
---|---|---|
committer | Adrian Prantl <aprantl@apple.com> | 2013-07-09 20:28:37 +0000 |
commit | 3517640443f0b5224e2a6414c246ac60016ee9d4 (patch) | |
tree | 011ad059026ee96743b0327cd32e41679c4f4021 /lib/CodeGen/SelectionDAG/FastISel.cpp | |
parent | 7d185e4e5b1da7e07e1c3b9539e2c9bc8e983e62 (diff) | |
download | llvm-3517640443f0b5224e2a6414c246ac60016ee9d4.tar.gz llvm-3517640443f0b5224e2a6414c246ac60016ee9d4.tar.bz2 llvm-3517640443f0b5224e2a6414c246ac60016ee9d4.tar.xz |
Reapply an improved version of r180816/180817.
Change the informal convention of DBG_VALUE machine instructions so that
we can express a register-indirect address with an offset of 0.
The old convention was that a DBG_VALUE is a register-indirect value if
the offset (operand 1) is nonzero. The new convention is that a DBG_VALUE
is register-indirect if the first operand is a register and the second
operand is an immediate. For plain register values the combination reg,
reg is used. MachineInstrBuilder::BuildMI knows how to build the new
DBG_VALUES.
rdar://problem/13658587
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185966 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/SelectionDAG/FastISel.cpp')
-rw-r--r-- | lib/CodeGen/SelectionDAG/FastISel.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp index cb55324aec..14a2b005c0 100644 --- a/lib/CodeGen/SelectionDAG/FastISel.cpp +++ b/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -612,11 +612,13 @@ bool FastISel::SelectCall(const User *I) { return true; } + unsigned Offset = 0; Optional<MachineOperand> Op; if (const Argument *Arg = dyn_cast<Argument>(Address)) // Some arguments' frame index is recorded during argument lowering. - if (int FI = FuncInfo.getArgumentFrameIndex(Arg)) - Op = MachineOperand::CreateFI(FI); + Offset = FuncInfo.getArgumentFrameIndex(Arg); + if (Offset) + Op = MachineOperand::CreateFI(Offset); if (!Op) if (unsigned Reg = lookUpRegForValue(Address)) Op = MachineOperand::CreateReg(Reg, false); @@ -638,12 +640,16 @@ bool FastISel::SelectCall(const User *I) { Op = MachineOperand::CreateReg(FuncInfo.InitializeRegForValue(Address), false); - if (Op && Op->isReg()) - Op->setIsDebug(true); - if (Op) - BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, - TII.get(TargetOpcode::DBG_VALUE)).addOperand(*Op).addImm(0) + if (Op->isReg()) { + Op->setIsDebug(true); + BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, + TII.get(TargetOpcode::DBG_VALUE), + /* IsIndirect */ DI->getAddress()->getType()->isPointerTy(), + Op->getReg(), Offset, DI->getVariable()); + } else + BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, + TII.get(TargetOpcode::DBG_VALUE)).addOperand(*Op).addImm(0) .addMetadata(DI->getVariable()); else // We can't yet handle anything else here because it would require @@ -676,9 +682,9 @@ bool FastISel::SelectCall(const User *I) { .addFPImm(CF).addImm(DI->getOffset()) .addMetadata(DI->getVariable()); } else if (unsigned Reg = lookUpRegForValue(V)) { - BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, II) - .addReg(Reg, RegState::Debug).addImm(DI->getOffset()) - .addMetadata(DI->getVariable()); + bool IsIndirect = DI->getOffset() != 0; + BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, II, IsIndirect, + Reg, DI->getOffset(), DI->getVariable()); } else { // We can't yet handle anything else here because it would require // generating code, thus altering codegen because of debug info. |