[ELF] Make --trace-symbol track preempted shared definitions

[MaskRay]

Summary

Note, we still name a preempted SharedSymbol "shared definition",
instead of "reference" as printed by GNU ld. This difference should not matter.

// GNU ld
ld.bfd: t: definition of f@v1
ld.bfd: t.so: reference to f@v1

[MaskRay]

Delete an empty line

[MaskRay]

Simplify

[psmith]

LGTM.

lld/ELF/Symbols.cpp

716

I know some prefer an unrelated refactoring change to be split out. Maybe worth committing this separately as an NFC white space change.

[MaskRay]

Drop unneeded changes

lld/ELF/Symbols.cpp

if (isWeak()) {
     type = ty;
     binding = STB_WEAK;
     return;
   }
 
   other.fetch();
 }
 
 void Symbol::resolveShared(const SharedSymbol &other) {
-
   if (isCommon()) {
     // See the comment in resolveCommon() above.
     if (other.size > cast<CommonSymbol>(this)->size)
       cast<CommonSymbol>(this)->size = other.size;
     return;
   }
   if (visibility == STV_DEFAULT && (isUndefined() || isLazy())) {
     // An undefined symbol with non default visibility must be satisfied
     // in the same DSO.
     uint8_t bind = binding;
     replace(other);
     binding = bind;
-  }
+  } else if (traced)
+    printTraceSymbol(&other);
 }

lld/test/ELF/trace-symbols.s

 # REQUIRES: x86
 # Test -y symbol and -trace-symbol=symbol
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 # RUN: %p/Inputs/trace-symbols-foo-weak.s -o %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 # RUN: %p/Inputs/trace-symbols-foo-strong.s -o %t2
 # RUN: ld.lld -shared %t1 -o %t1.so
 # RUN: ld.lld -shared %t2 -o %t2.so
 # RUN: rm -f %t1.a
 # RUN: llvm-ar rcs %t1.a %t1
 # RUN: rm -f %t2.a
 # RUN: llvm-ar rcs %t2.a %t2
 
+# RUN: ld.lld -y foo -shared %t1 %t1.so -o /dev/null | \
+# RUN:   FileCheck --check-prefix=PREEMPT %s --implicit-check-not=foo
+# PREEMPT:      trace-symbols.s.tmp1: definition of foo
+# PREEMPT-NEXT: trace-symbols.s.tmp1.so: shared definition of foo
+
 # RUN: ld.lld -y foo -trace-symbol common -trace-symbol=hsymbol \
 # RUN:   %t %t1 %t2 -o %t3 | FileCheck -check-prefix=OBJECTRFOO %s
 # OBJECTRFOO: trace-symbols.s.tmp: reference to foo
 
 # RUN: ld.lld -y foo -trace-symbol=common -trace-symbol=hsymbol \
 # RUN:   %t %t1 %t2 -o %t3 | FileCheck -check-prefix=OBJECTDCOMMON %s
 # OBJECTDCOMMON: trace-symbols.s.tmp1: common definition of common
 

 
 # RUN: ld.lld -y foo -y common %t %t2 %t1.a -o %t3 | \
 # RUN:   FileCheck -check-prefix=FOO_AND_COMMON %s
 # FOO_AND_COMMON: trace-symbols.s.tmp: reference to foo
 # FOO_AND_COMMON: trace-symbols.s.tmp2: definition of foo
 # FOO_AND_COMMON: trace-symbols.s.tmp1.a: lazy definition of common
 
 # RUN: ld.lld -y foo -y common %t %t1.so %t2 -o %t3 | \
-# RUN:   FileCheck -check-prefix=SHLIBDCOMMON %s
+# RUN:   FileCheck -check-prefix=SHLIBDCOMMON %s --implicit-check-not=bar
 # SHLIBDCOMMON: trace-symbols.s.tmp1.so: shared definition of common
 
 # RUN: ld.lld -y foo -y common %t %t2.so %t1.so -o %t3 | \
 # RUN:   FileCheck -check-prefix=SHLIBD2FOO %s
 # RUN: ld.lld -y foo %t %t1.a %t2.so -o %t3 | \
 # RUN:   FileCheck -check-prefix=NO-SHLIBD2FOO %s
 # SHLIBD2FOO:        trace-symbols.s.tmp2.so: shared definition of foo
 # NO-SHLIBD2FOO-NOT: trace-symbols.s.tmp2.so: definition of foo

lld/test/ELF/verneed-shared.s

 # REQUIRES: x86
 # RUN: echo 'v1 { f; }; v2 { g; };' > %t.ver
 # RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
 # RUN: ld.lld -shared --version-script %t.ver %t.o -o %t.so
 
 # RUN: ld.lld --version-script %t.ver %t.o %t.so -o /dev/null -y f@v1 | \
 # RUN:   FileCheck --check-prefix=TRACE %s --implicit-check-not=f@v1
 
 ## TRACE:      {{.*}}.o: definition of f@v1
+## TRACE-NEXT: {{.*}}.so: shared definition of f@v1
 
 # RUN: echo '.symver f,f@v1; .symver g,g@v2; call f; call g' | \
 # RUN:   llvm-mc -filetype=obj -triple=x86_64 - -o %t1.o
 # RUN: ld.lld -shared %t1.o %t.so -o %t1.so
 
 ## Test that we can parse SHT_GNU_verneed to know that the undefined symbols in
 ## %t1.so are called 'f@v1' and 'g@v2', which can be satisfied by the executable.
 ## We will thus export the symbols.