[PATCH] D40102: [coff] correctly emit safeseh entries for handlers defined in dlls

[Bob Haarman via Phabricator via llvm-commits]

inglorion updated this revision to Diff 123087.
inglorion added a comment.

updated test to check for exactly one entry instead of at least one


https://reviews.llvm.org/D40102

Files:
  lld/COFF/Writer.cpp
  lld/test/COFF/Inputs/except_handler3.lib
  lld/test/COFF/safeseh-md.s


Index: lld/test/COFF/safeseh-md.s
===================================================================
--- /dev/null
+++ lld/test/COFF/safeseh-md.s
@@ -0,0 +1,34 @@
+# RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
+# RUN: lld-link %t.obj %S/Inputs/except_handler3.lib -safeseh -out:%t.exe -opt:noref -entry:main
+# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s
+
+# CHECK: SEHTable [
+# CHECK-NEXT: 0x
+# CHECK-NEXT: ]
+
+        .def     @feat.00;
+        .scl    3;
+        .type   0;
+        .endef
+        .globl  @feat.00
+ at feat.00 = 1
+
+        .def     _main;
+        .scl    2;
+        .type   32;
+        .endef
+        .section        .text,"xr",one_only,_main
+        .globl  _main
+_main:
+        movl $42, %eax
+        ret
+
+.safeseh __except_handler3
+
+	.section .rdata,"dr"
+.globl __load_config_used
+__load_config_used:
+        .long 72
+        .fill 60, 1, 0
+        .long ___safe_se_handler_table
+        .long ___safe_se_handler_count
Index: lld/COFF/Writer.cpp
===================================================================
--- lld/COFF/Writer.cpp
+++ lld/COFF/Writer.cpp
@@ -788,11 +788,9 @@
     if (!File->SEHCompat)
       return;
     for (Symbol *B : File->SEHandlers) {
-      // Make sure the handler is still live. Assume all handlers are regular
-      // symbols.
-      auto *D = dyn_cast<DefinedRegular>(B);
-      if (D && D->getChunk()->isLive())
-        Handlers.insert(D);
+      // Make sure the handler is still live.
+      if (B->isLive())
+        Handlers.insert(cast<Defined>(B));
     }
   }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40102.123087.patch
Type: text/x-patch
Size: 1595 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171115/812fd4c8/attachment.bin>