[ELF] - Fix incorrect logic in VersionScriptParser::parseVersion()

[grimar]

Summary

Previously the next sample script would generate 2 entries in
Config->SymbolVersions with the same version name.

VERSION {
 global: c;
};

That happened because parseVersionSymbols() was called twice.
At first for "global:" and since there is no local tag, it was called again.
Patch fixes the issue, testcase update to demonstrate.

[grimar]

• Reduced testcase.

[ruiu]

ELF/SymbolListFile.cpp

93 ↗

(On Diff #61660)

Why don't you add

else if (peek() != "}")

here?

[grimar]

ELF/SymbolListFile.cpp

93 ↗

(On Diff #61660)

That was one of the ways and first what I wanted to do. My way looks more clean for my eye, though I am fine with both variants.
I`ll update the patch according to your suggestion then.

[grimar]

• Addressed review comments.

[ruiu]

LGTM

lld/trunk/ELF/SymbolListFile.cpp

 void VersionScriptParser::parseVersion(StringRef Version) {
   expect("{");
   if (peek() == "global:") {
     next();
     parseVersionSymbols(Version);
   }
   if (peek() == "local:")
     parseLocal();
-  else
+  else if (peek() != "}")
     parseVersionSymbols(Version);
 
   expect("}");
   if (!Version.empty() && peek() != ";")
     Config->SymbolVersions.back().Parent = next();
   expect(";");
 }
 

lld/trunk/test/ELF/verdef-dependency.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "LIBSAMPLE_1.0{               \
 # RUN:          global: a;                \
 # RUN:          local: *; };              \
 # RUN:       LIBSAMPLE_2.0{               \
 # RUN:          global: b;                \
 # RUN:          local: *; }LIBSAMPLE_1.0; \
 # RUN:       LIBSAMPLE_3.0{               \
 # RUN:          global: c;                \
-# RUN:          local: *; }LIBSAMPLE_2.0;" > %t.script
+# RUN:       }LIBSAMPLE_2.0;" > %t.script
 # RUN: ld.lld --version-script %t.script -shared -soname shared %t.o -o %t.so
 # RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      SHT_GNU_verdef {
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
 # DSO-NEXT:     Flags: Base
 # DSO-NEXT:     Index: 1