[PATCH] D36545: [LLD] [COFF] Fix the name type for stdcall functions in import libraries

[Martin Storsjö via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL310989: [COFF] Fix the name type for stdcall functions in import libraries (authored by mstorsjo).

Changed prior to commit:
  https://reviews.llvm.org/D36545?vs=110460&id=111307#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D36545

Files:
  lld/trunk/COFF/Driver.cpp
  lld/trunk/test/COFF/def-export-stdcall.s


Index: lld/trunk/test/COFF/def-export-stdcall.s
===================================================================
--- lld/trunk/test/COFF/def-export-stdcall.s
+++ lld/trunk/test/COFF/def-export-stdcall.s
@@ -2,7 +2,8 @@
 # RUN: llvm-mc -filetype=obj -triple=i686-windows-msvc %s -o %t.obj
 # RUN: echo -e "LIBRARY foo\nEXPORTS\n  stdcall" > %t.def
 # RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
-# RUN: llvm-nm %t.lib | FileCheck %s
+# RUN: llvm-readobj %t.lib | FileCheck %s
+# CHECK: Name type: undecorate
 # CHECK: __imp__stdcall at 8
 # CHECK: _stdcall at 8
 
Index: lld/trunk/COFF/Driver.cpp
===================================================================
--- lld/trunk/COFF/Driver.cpp
+++ lld/trunk/COFF/Driver.cpp
@@ -461,8 +461,8 @@
   std::vector<COFFShortExport> Exports;
   for (Export &E1 : Config->Exports) {
     COFFShortExport E2;
-    // Use SymbolName, which will have any stdcall or fastcall qualifiers.
-    E2.Name = E1.SymbolName;
+    E2.Name = E1.Name;
+    E2.SymbolName = E1.SymbolName;
     E2.ExtName = E1.ExtName;
     E2.Ordinal = E1.Ordinal;
     E2.Noname = E1.Noname;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36545.111307.patch
Type: text/x-patch
Size: 1137 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170816/1eeca48b/attachment.bin>