[ELF] - Handle every global as unversioned export in versioned script.

[grimar]

Summary

Patch updates the version script parser to parse versioned files.
In a simple way, just adding them to VersionScriptGlobals list.

[ruiu]

Can you organize this as a part of recursive descendant parser? You can create a function parseVersion and do something like this.

if (peek() == "{") {
  parseVersin();
  if (!atEOF())
    setError("anonymous version definition is used in combination with other version definitions");
  return;
}
while (!atEOF()) {
  StringRef Version = next();
  parseVersion();
}

[grimar]

• Reimplemented using recursive descendant parser.
• Improved testcase.

[grimar]

In D21439#460016, @ruiu wrote:

Can you organize this as a part of recursive descendant parser? You can create a function parseVersion and do something like this.

if (peek() == "{") {
  parseVersin();
  if (!atEOF())
    setError("anonymous version definition is used in combination with other version definitions");
  return;
}
while (!atEOF()) {
  StringRef Version = next();
  parseVersion();
}

Looks really better IMO. Thanks for hint !

[ruiu]

LGTM with nits.

ELF/SymbolListFile.cpp

111

I'd call it Msg.

Acutally, my preference is to use goto to jump to the end of the function and call setError("anonymous version def..."), but probably there are many people who don't like it, so I'm okay with this.

122

Let's return after setError(). (And remove else.)

ELF/SymbolListFile.cpp

 class VersionScriptParser final : public ScriptParserBase {
 public:
   VersionScriptParser(StringRef S) : ScriptParserBase(S) {}
 
   void run();
 };
 
 void VersionScriptParser::run() {
+  size_t Id = 0;
+  bool HasAnonymousTag = false;
+  while (!atEOF() && !Error) {
+    if (peek() == "{")
+      HasAnonymousTag = true;
+    else
+      next();
+    if (Id > 0 && HasAnonymousTag)
+      setError("anonymous version tag cannot be "
+               "combined with other version tag");
+
     expect("{");
     if (peek() == "global:") {
       next();
       while (!Error) {
         Config->VersionScriptGlobals.push_back(next());
         expect(";");
         if (peek() == "local:")
           break;
       }
     }
     expect("local:");
     expect("*");
     expect(";");
     expect("}");
     expect(";");
-  if (!atEOF())
-    setError("expected EOF");
+    ++Id;
+  }
 }
 
 void elf::parseVersionScript(MemoryBufferRef MB) {
   VersionScriptParser(MB.getBuffer()).run();
 }

test/ELF/version-script.s

 # RUN: ld.lld --version-script %t3.script -shared %t.o %t2.so -o %t3.so
 # RUN: llvm-readobj -dyn-symbols %t3.so | FileCheck --check-prefix=DSO2 %s
 
 # --version-script filters --dynamic-list.
 # RUN: echo "{ foo1; foo2; };" > %t.list
 # RUN: ld.lld --version-script %t.script --dynamic-list %t.list %t.o %t2.so -o %t
 # RUN: llvm-readobj -dyn-symbols %t | FileCheck --check-prefix=EXE %s
 
+# RUN: echo "VERSION_1.0{      \
+# RUN:          global: foo1;  \
+# RUN:          local: *; };   \
+# RUN:       VERSION_2.0{      \
+# RUN:          global: foo3;  \
+# RUN:          local: *; }; " > %t4.script
+# RUN: ld.lld --version-script %t4.script -shared %t.o %t2.so -o %t4.so
+# RUN: llvm-readobj -dyn-symbols %t4.so | FileCheck --check-prefix=DSO %s
+
+# RUN: echo "VERSION_1.0{     \
+# RUN:          global: foo1; \
+# RUN:          local: *; };  \
+# RUN:          {             \
+# RUN:          global: foo3; \
+# RUN:          local: *; }; " > %t5.script
+# RUN: not ld.lld --version-script %t5.script -shared %t.o %t2.so -o %t5.so 2>&1 | \
+# RUN:   FileCheck -check-prefix=ERR %s
+# ERR: anonymous version tag cannot be combined with other version tag
+
+# RUN: ld.lld --version-script %t.script --dynamic-list %t.list %t.o %t2.so -o %t2
+# RUN: llvm-readobj %t2 > /dev/null
+
 # DSO:      DynamicSymbols [
 # DSO-NEXT:   Symbol {
 # DSO-NEXT:     Name: @ (0)
 # DSO-NEXT:     Value: 0x0
 # DSO-NEXT:     Size: 0
 # DSO-NEXT:     Binding: Local (0x0)
 # DSO-NEXT:     Type: None (0x0)
 # DSO-NEXT:     Other: 0