[PATCH] D86528: [4/5] [MC] [Win64EH] Fill in FuncletOrFuncEnd if missing

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 288270.
mstorsjo added a comment.

Updated the testcase after the new version of 3/5.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D86528/new/

https://reviews.llvm.org/D86528

Files:
  llvm/include/llvm/MC/MCWinEH.h
  llvm/lib/MC/MCStreamer.cpp
  llvm/lib/MC/MCWin64EH.cpp
  llvm/test/MC/AArch64/seh.s


Index: llvm/test/MC/AArch64/seh.s
===================================================================
--- llvm/test/MC/AArch64/seh.s
+++ llvm/test/MC/AArch64/seh.s
@@ -46,6 +46,12 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
+// CHECK-NEXT: UnwindInformation [
+// CHECK-NEXT:   RuntimeFunction {
+// CHECK-NEXT:     Function: func
+// CHECK-NEXT:     ExceptionRecord: .xdata
+// CHECK-NEXT:     ExceptionData {
+// CHECK-NEXT:       FunctionLength: 8
 
     .text
     .globl func
Index: llvm/lib/MC/MCWin64EH.cpp
===================================================================
--- llvm/lib/MC/MCWin64EH.cpp
+++ llvm/lib/MC/MCWin64EH.cpp
@@ -526,7 +526,9 @@
   int64_t RawFuncLength;
   if (!info->FuncletOrFuncEnd) {
     // FIXME: This is very wrong; we emit SEH data which covers zero bytes
-    // of code. But otherwise test/MC/AArch64/seh.s crashes.
+    // of code.
+    // This can happen if unwind info is forced to be generated (with a
+    // .seh_handlerdata directive) directly after the start of the function.
     RawFuncLength = 0;
   } else {
     // FIXME: GetAbsDifference tries to compute the length of the function
@@ -702,6 +704,16 @@
 
 void llvm::Win64EH::ARM64UnwindEmitter::EmitUnwindInfo(
     MCStreamer &Streamer, WinEH::FrameInfo *info) const {
+  // Called if there's an .seh_handlerdata directive before the end of the
+  // function. This forces writing the xdata record already here - and
+  // in this case, the function isn't actually ended already, but the xdata
+  // record needs to know the function length. In these cases, if the funclet
+  // end hasn't been marked yet, the xdata function length won't cover the
+  // whole function, only up to this point.
+  if (!info->FuncletOrFuncEnd) {
+    Streamer.SwitchSection(info->TextSection);
+    info->FuncletOrFuncEnd = Streamer.emitCFILabel();
+  }
   // Switch sections (the static function above is meant to be called from
   // here and from Emit().
   MCSection *XData = Streamer.getAssociatedXDataSection(info->TextSection);
Index: llvm/lib/MC/MCStreamer.cpp
===================================================================
--- llvm/lib/MC/MCStreamer.cpp
+++ llvm/lib/MC/MCStreamer.cpp
@@ -692,6 +692,8 @@
 
   MCSymbol *Label = emitCFILabel();
   CurFrame->End = Label;
+  if (!CurFrame->FuncletOrFuncEnd)
+    CurFrame->FuncletOrFuncEnd = CurFrame->End;
 }
 
 void MCStreamer::EmitWinCFIFuncletOrFuncEnd(SMLoc Loc) {
Index: llvm/include/llvm/MC/MCWinEH.h
===================================================================
--- llvm/include/llvm/MC/MCWinEH.h
+++ llvm/include/llvm/MC/MCWinEH.h
@@ -36,7 +36,7 @@
   const MCSymbol *Function = nullptr;
   const MCSymbol *PrologEnd = nullptr;
   const MCSymbol *Symbol = nullptr;
-  const MCSection *TextSection = nullptr;
+  MCSection *TextSection = nullptr;
 
   bool HandlesUnwind = false;
   bool HandlesExceptions = false;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D86528.288270.patch
Type: text/x-patch
Size: 2881 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200827/eaa21ff1/attachment.bin>