[lld] r253588 - [ELF] Prevent SEGFAULT in case of conflict with an internally defined symbol.

[Igor Kudrin via llvm-commits]

Author: ikudrin
Date: Thu Nov 19 13:08:45 2015
New Revision: 253588

URL: http://llvm.org/viewvc/llvm-project?rev=253588&view=rev
Log:
[ELF] Prevent SEGFAULT in case of conflict with an internally defined symbol.

Differential Revision: http://reviews.llvm.org/D14832

Added:
    lld/trunk/test/ELF/duplicate-internal.s
Modified:
    lld/trunk/ELF/SymbolTable.cpp

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=253588&r1=253587&r2=253588&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Thu Nov 19 13:08:45 2015
@@ -139,7 +139,8 @@ void SymbolTable<ELFT>::reportConflict(c
   }
 
   std::string Msg = (Message + ": " + Old.getName() + " in " +
-                     OldFile->getName() + " and " + NewFile->getName())
+                     (OldFile ? OldFile->getName() : "(internal)") + " and " +
+                     (NewFile ? NewFile->getName() : "(internal)"))
                         .str();
   if (Warning)
     warning(Msg);

Added: lld/trunk/test/ELF/duplicate-internal.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/duplicate-internal.s?rev=253588&view=auto
==============================================================================
--- lld/trunk/test/ELF/duplicate-internal.s (added)
+++ lld/trunk/test/ELF/duplicate-internal.s Thu Nov 19 13:08:45 2015
@@ -0,0 +1,11 @@
+# Should print an expected message in case of conflict with an internally generated symbol.
+
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
+# RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
+
+# CHECK: duplicate symbol: _gp in (internal) and {{.*}}
+
+# REQUIRES: mips
+
+  .globl  _gp
+_gp = 0