ELF: Read all dynamic lists specified on the command line.

[pcc]

Summary

We were previously only reading the last one.

Fixes PR31939 (which was likely the issue underlying
https://github.com/google/oss-fuzz/issues/295).

[ruiu]

LGTM

lld/ELF/LinkerScript.cpp

1945–1946 ↗

(On Diff #88082)

Can this be for (SymbolVersion V : readSymbols())?

lld/trunk/ELF/Driver.cpp

void LinkerDriver::readConfigs(opt::InputArgList &Args) {
   for (auto *Arg : Args.filtered(OPT_auxiliary))
     Config->AuxiliaryList.push_back(Arg->getValue());
   if (!Config->Shared && !Config->AuxiliaryList.empty())
     error("-f may not be used without -shared");
 
   for (auto *Arg : Args.filtered(OPT_undefined))
     Config->Undefined.push_back(Arg->getValue());
 
-  if (auto *Arg = Args.getLastArg(OPT_dynamic_list))
+  for (auto *Arg : Args.filtered(OPT_dynamic_list))
     if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
       readDynamicList(*Buffer);
 
   if (auto *Arg = Args.getLastArg(OPT_symbol_ordering_file))
     if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
       Config->SymbolOrderingFile = getLines(*Buffer);
 
   // If --retain-symbol-file is used, we'll keep only the symbols listed in

lld/trunk/ELF/LinkerScript.cpp

 
 // Reads a list of symbols, e.g. "{ global: foo; bar; local: *; };".
 void ScriptParser::readAnonymousDeclaration() {
   // Read global symbols first. "global:" is default, so if there's
   // no label, we assume global symbols.
   if (peek() != "local") {
     if (consume("global"))
       expect(":");
-    Config->VersionScriptGlobals = readSymbols();
+    for (SymbolVersion V : readSymbols())
+      Config->VersionScriptGlobals.push_back(V);
   }
   readLocals();
   expect("}");
   expect(";");
 }
 
 void ScriptParser::readLocals() {
   if (!consume("local"))

lld/trunk/test/ELF/dynamic-list.s

 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 
 ## Now export all the foo1, foo2, and foo31 symbols
 # RUN: echo "{ foo1; foo2; foo31; };" > %t.list
 # RUN: ld.lld --dynamic-list %t.list %t %t2.so -o %t.exe
 # RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: echo "{ foo1; foo2; };" > %t1.list
+# RUN: echo "{ foo31; };" > %t2.list
+# RUN: ld.lld --dynamic-list %t1.list --dynamic-list %t2.list %t %t2.so -o %t.exe
+# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 # CHECK2:      DynamicSymbols [
 # CHECK2-NEXT:   Symbol {
 # CHECK2-NEXT:     Name: @
 # CHECK2-NEXT:     Value: 0x0
 # CHECK2-NEXT:     Size: 0
 # CHECK2-NEXT:     Binding: Local
 # CHECK2-NEXT:     Type: None