[PATCH] D66617: [llvm-dlltool] Make sure to strip decorations from ExtName for renamed exports

[Martin Storsjö via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL369747: [llvm-dlltool] Make sure to strip decorations from ExtName for renamed exports (authored by mstorsjo, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D66617?vs=216698&id=216803#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D66617

Files:
  llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
  llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def


Index: llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
===================================================================
--- llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
+++ llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
@@ -9,6 +9,7 @@
 @FastcallFunction at 4
 StdcallAlias at 4==StdcallFunction at 4
 ??_7exception@@6B@
+StdcallExportName at 4=StdcallInternalFunction at 4
 
 ; CHECK: Name type: noprefix
 ; CHECK: Symbol: __imp__CdeclFunction
@@ -24,3 +25,5 @@
 ; CHECK: Symbol: ??_7exception@@6B@
 ; CHECK-NM: W _StdcallAlias at 4
 ; CHECK-NM: U _StdcallFunction at 4
+; CHECK: Symbol: __imp__StdcallExportName at 4{{$}}
+; CHECK: Symbol: _StdcallExportName at 4{{$}}
Index: llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
===================================================================
--- llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
+++ llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
@@ -171,6 +171,7 @@
       // By making sure E.SymbolName != E.Name for decorated symbols,
       // writeImportLibrary writes these symbols with the type
       // IMPORT_NAME_UNDECORATE.
+      E.ExtName = E.ExtName.substr(0, E.ExtName.find('@', 1));
     }
   }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66617.216803.patch
Type: text/x-patch
Size: 1193 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190823/86ee01da/attachment.bin>