This is an archive of the discontinued LLVM Phabricator instance.

Differential D43456

[MC] - Don't crash on unclosed frame.
ClosedPublic

Authored by grimar on Feb 19 2018, 3:32 AM.

Details

Reviewers
• espindola
Commits
rG9712113f8ba6: [MC] - Don't crash on unclosed frame.
rL325564: [MC] - Don't crash on unclosed frame.
Summary

llvm-mc can crash when
there is cfi_startproc without cfi_end_proc:

.text
.globl foo
foo:
 .cfi_startproc

Testcase shows the issue, patch fixes it.

Diff Detail

Event Timeline

grimar updated this revision to Diff 134883.Feb 19 2018, 3:32 AM
grimar created this revision.
  • Add forgotten code change.
• espindola accepted this revision.Feb 19 2018, 8:52 AM

LGTM

This revision is now accepted and ready to land.Feb 19 2018, 8:52 AM
Closed by commit rL325564: [MC] - Don't crash on unclosed frame. (authored by grimar). · Explain WhyFeb 20 2018, 1:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
MC/
7 lines
test/
MC/
X86/
10 lines

Diff 134883

lib/MC/MCStreamer.cpp

Show First 20 Lines • Show All 810 Lines • ▼ Show 20 Linesvoid MCStreamer::EmitRawText(const Twine &T) {
SmallString<128> Str; SmallString<128> Str;
EmitRawTextImpl(T.toStringRef(Str)); EmitRawTextImpl(T.toStringRef(Str));
} }
void MCStreamer::EmitWindowsUnwindTables() { void MCStreamer::EmitWindowsUnwindTables() {
} }
void MCStreamer::Finish() { void MCStreamer::Finish() {
if (!DwarfFrameInfos.empty() && !DwarfFrameInfos.back().End) if ((!DwarfFrameInfos.empty() && !DwarfFrameInfos.back().End) ||
getContext().reportError(SMLoc(), "Unfinished frame!"); (!WinFrameInfos.empty() && !WinFrameInfos.back()->End)) {
if (!WinFrameInfos.empty() && !WinFrameInfos.back()->End)
getContext().reportError(SMLoc(), "Unfinished frame!"); getContext().reportError(SMLoc(), "Unfinished frame!");
return;
}
MCTargetStreamer *TS = getTargetStreamer(); MCTargetStreamer *TS = getTargetStreamer();
if (TS) if (TS)
TS->finish(); TS->finish();
FinishImpl(); FinishImpl();
} }
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines

test/MC/X86/cfi-scope-unclosed.s

# RUN: not llvm-mc %s -filetype=obj -triple=x86_64-unknown-linux \
# RUN: -o /dev/null 2>&1 | FileCheck %s
## Check we don't crash on unclosed frame scope.
# CHECK: error: Unfinished frame!
.text
.globl foo
foo:
.cfi_startproc