[llvm-branch-commits] [llvm-branch] r311096 - Merging r310988:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug 17 09:57:03 2017
New Revision: 311096

URL: http://llvm.org/viewvc/llvm-project?rev=311096&view=rev
Log:
Merging r310988:
------------------------------------------------------------------------
r310988 | mstorsjo | 2017-08-15 22:13:16 -0700 (Tue, 15 Aug 2017) | 8 lines

[COFF] Add SymbolName as a distinct field in COFFImportFile

The previous Name and ExtName aren't enough to convey all the nuances
between weak aliases and stdcall decorated function names.

A test for this will be added in LLD.

Differential Revision: https://reviews.llvm.org/D36544
------------------------------------------------------------------------

Modified:
    llvm/branches/release_50/   (props changed)
    llvm/branches/release_50/include/llvm/Object/COFFImportFile.h
    llvm/branches/release_50/lib/Object/COFFImportFile.cpp

Propchange: llvm/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 17 09:57:03 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,308483-308484,308503,308808,308813,308847,308891,308906,308950,308963,308978,308986,309044,309071,309113,309120,309122,309140,309227,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309614,309651,309744,309758,309849,309928,309930,309945,310071,310190,310240-310242,310250,310253,310267,310481,310492,310510,310534,310552,310604,310779,310784,310796,310842,310926,310939
+/llvm/trunk:155241,308483-308484,308503,308808,308813,308847,308891,308906,308950,308963,308978,308986,309044,309071,309113,309120,309122,309140,309227,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309614,309651,309744,309758,309849,309928,309930,309945,310071,310190,310240-310242,310250,310253,310267,310481,310492,310510,310534,310552,310604,310779,310784,310796,310842,310926,310939,310988

Modified: llvm/branches/release_50/include/llvm/Object/COFFImportFile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/include/llvm/Object/COFFImportFile.h?rev=311096&r1=311095&r2=311096&view=diff
==============================================================================
--- llvm/branches/release_50/include/llvm/Object/COFFImportFile.h (original)
+++ llvm/branches/release_50/include/llvm/Object/COFFImportFile.h Thu Aug 17 09:57:03 2017
@@ -73,6 +73,7 @@ private:
 struct COFFShortExport {
   std::string Name;
   std::string ExtName;
+  std::string SymbolName;
 
   uint16_t Ordinal = 0;
   bool Noname = false;

Modified: llvm/branches/release_50/lib/Object/COFFImportFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/lib/Object/COFFImportFile.cpp?rev=311096&r1=311095&r2=311096&view=diff
==============================================================================
--- llvm/branches/release_50/lib/Object/COFFImportFile.cpp (original)
+++ llvm/branches/release_50/lib/Object/COFFImportFile.cpp Thu Aug 17 09:57:03 2017
@@ -587,7 +587,7 @@ std::error_code writeImportLibrary(Strin
     if (E.Constant)
       ImportType = IMPORT_CONST;
 
-    StringRef SymbolName = E.isWeak() ? E.ExtName : E.Name;
+    StringRef SymbolName = E.SymbolName.empty() ? E.Name : E.SymbolName;
     ImportNameType NameType = getNameType(SymbolName, E.Name, Machine);
     Expected<std::string> Name = E.ExtName.empty()
                                      ? SymbolName