diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-09-09 19:48:37 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-09-09 19:48:37 +0000 |
| commit | da11df0c22f5d0ba2e2be3ae4a7076c806233db8 (patch) | |
| tree | 5c6b6d725fd502b9d691276ef457b0f0aa67f9a8 /include | |
| parent | 2c9905a1f3bcf22cc2f93332cc8411d11798ba07 (diff) | |
| download | external_llvm-da11df0c22f5d0ba2e2be3ae4a7076c806233db8.zip external_llvm-da11df0c22f5d0ba2e2be3ae4a7076c806233db8.tar.gz external_llvm-da11df0c22f5d0ba2e2be3ae4a7076c806233db8.tar.bz2 | |
Call generateCompactUnwindEncodings() right before we need to output the frame information.
There are more than one paths to where the frame information is emitted. Place
the call to generateCompactUnwindEncodings() into the method which outputs the
frame information, thus ensuring that the encoding is there for every path. This
involved threading the MCAsmBackend object through to this method.
<rdar://problem/13623355>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190335 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/MC/MCDwarf.h | 4 | ||||
| -rw-r--r-- | include/llvm/MC/MCStreamer.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/llvm/MC/MCDwarf.h b/include/llvm/MC/MCDwarf.h index c671dd9..7a06cc0 100644 --- a/include/llvm/MC/MCDwarf.h +++ b/include/llvm/MC/MCDwarf.h @@ -23,6 +23,7 @@ #include <vector> namespace llvm { +class MCAsmBackend; class MCContext; class MCSection; class MCStreamer; @@ -449,7 +450,8 @@ public: // // This emits the frame info section. // - static void Emit(MCStreamer &streamer, bool usingCFI, bool isEH); + static void Emit(MCStreamer &streamer, MCAsmBackend *MAB, + bool usingCFI, bool isEH); static void EmitAdvanceLoc(MCStreamer &Streamer, uint64_t AddrDelta); static void EncodeAdvanceLoc(MCContext &Context, uint64_t AddrDelta, raw_ostream &OS); diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h index c849e59..cd297a4 100644 --- a/include/llvm/MC/MCStreamer.h +++ b/include/llvm/MC/MCStreamer.h @@ -104,7 +104,7 @@ protected: virtual void EmitCFIStartProcImpl(MCDwarfFrameInfo &Frame); void RecordProcEnd(MCDwarfFrameInfo &Frame); virtual void EmitCFIEndProcImpl(MCDwarfFrameInfo &CurFrame); - void EmitFrames(bool usingCFI); + void EmitFrames(MCAsmBackend *MAB, bool usingCFI); MCWin64EHUnwindInfo *getCurrentW64UnwindInfo() { return CurrentW64UnwindInfo; @@ -134,7 +134,7 @@ public: return *W64UnwindInfos[i]; } - void generateCompactUnwindEncodings(MCAsmBackend &MAB); + void generateCompactUnwindEncodings(MCAsmBackend *MAB); /// @name Assembly File Formatting. /// @{ |