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

[George Rimar via llvm-commits]

Author: grimar
Date: Tue Feb 20 01:04:13 2018
New Revision: 325564

URL: http://llvm.org/viewvc/llvm-project?rev=325564&view=rev
Log:
[MC] - Don't crash on unclosed frame.

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.

Differential revision: https://reviews.llvm.org/D43456

Added:
    llvm/trunk/test/MC/X86/cfi-scope-unclosed.s
Modified:
    llvm/trunk/lib/MC/MCStreamer.cpp

Modified: llvm/trunk/lib/MC/MCStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCStreamer.cpp?rev=325564&r1=325563&r2=325564&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCStreamer.cpp Tue Feb 20 01:04:13 2018
@@ -816,10 +816,11 @@ void MCStreamer::EmitWindowsUnwindTables
 }
 
 void MCStreamer::Finish() {
-  if (!DwarfFrameInfos.empty() && !DwarfFrameInfos.back().End)
-    getContext().reportError(SMLoc(), "Unfinished frame!");
-  if (!WinFrameInfos.empty() && !WinFrameInfos.back()->End)
+  if ((!DwarfFrameInfos.empty() && !DwarfFrameInfos.back().End) ||
+      (!WinFrameInfos.empty() && !WinFrameInfos.back()->End)) {
     getContext().reportError(SMLoc(), "Unfinished frame!");
+    return;
+  }
 
   MCTargetStreamer *TS = getTargetStreamer();
   if (TS)

Added: llvm/trunk/test/MC/X86/cfi-scope-unclosed.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/cfi-scope-unclosed.s?rev=325564&view=auto
==============================================================================
--- llvm/trunk/test/MC/X86/cfi-scope-unclosed.s (added)
+++ llvm/trunk/test/MC/X86/cfi-scope-unclosed.s Tue Feb 20 01:04:13 2018
@@ -0,0 +1,10 @@
+# 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