diff options
Diffstat (limited to 'llvm/lib/CodeGen')
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/WinException.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/PrologEpilogInserter.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/WinException.cpp b/llvm/lib/CodeGen/AsmPrinter/WinException.cpp index 4f1d5cb..bc2c9ee 100644 --- a/llvm/lib/CodeGen/AsmPrinter/WinException.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/WinException.cpp @@ -791,7 +791,7 @@ void WinException::computeIP2StateTable( // Emit an entry indicating that PCs after 'Label' have this EH state. if (I.State != LastEHState) IPToStateTable.push_back( - std::make_pair(create32bitRef(I.BeginLabel), I.State)); + std::make_pair(getLabelPlusOne(I.BeginLabel), I.State)); LastEHState = I.State; LastEndLabel = I.EndLabel; } diff --git a/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/llvm/lib/CodeGen/PrologEpilogInserter.cpp index 63825b5..495da5c 100644 --- a/llvm/lib/CodeGen/PrologEpilogInserter.cpp +++ b/llvm/lib/CodeGen/PrologEpilogInserter.cpp @@ -820,12 +820,11 @@ void PEI::replaceFrameIndices(MachineFunction &Fn) { Fn, FuncInfo.UnwindHelpFrameIdx, FrameReg); for (WinEHTryBlockMapEntry &TBME : FuncInfo.TryBlockMap) { for (WinEHHandlerType &H : TBME.HandlerArray) { - unsigned UnusedReg; if (H.CatchObj.FrameIndex == INT_MAX) H.CatchObj.FrameOffset = INT_MAX; else - H.CatchObj.FrameOffset = - TFI.getFrameIndexReference(Fn, H.CatchObj.FrameIndex, UnusedReg); + H.CatchObj.FrameOffset = TFI.getFrameIndexReferenceFromSP( + Fn, H.CatchObj.FrameIndex, FrameReg); } } } |