[lld] r227341 - Add a unit test for LinkerScript.

[Rui Ueyama]

Author: ruiu
Date: Wed Jan 28 12:38:50 2015
New Revision: 227341

URL: http://llvm.org/viewvc/llvm-project?rev=227341&view=rev
Log:
Add a unit test for LinkerScript.

Modified:
    lld/trunk/include/lld/Driver/Driver.h
    lld/trunk/lib/Driver/GnuLdDriver.cpp
    lld/trunk/unittests/DriverTests/GnuLdDriverTest.cpp

Modified: lld/trunk/include/lld/Driver/Driver.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/Driver.h?rev=227341&r1=227340&r2=227341&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/Driver.h (original)
+++ lld/trunk/include/lld/Driver/Driver.h Wed Jan 28 12:38:50 2015
@@ -76,6 +76,12 @@ public:
                     std::unique_ptr<ELFLinkingContext> &context,
                     raw_ostream &diagnostics = llvm::errs());
 
+  /// Parses a given memory buffer as a linker script and evaluate that.
+  /// Public function for testing.
+  static std::error_code evalLinkerScript(ELFLinkingContext &ctx,
+                                          std::unique_ptr<MemoryBuffer> mb,
+                                          raw_ostream &diag);
+
 private:
   static llvm::Triple getDefaultTarget(const char *progName);
   static bool applyEmulation(llvm::Triple &triple,

Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=227341&r1=227340&r2=227341&view=diff
==============================================================================
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Wed Jan 28 12:38:50 2015
@@ -249,9 +249,12 @@ evaluateLinkerScriptGroup(ELFLinkingCont
   for (const script::Path &path : group->getPaths()) {
     ErrorOr<StringRef> pathOrErr = path._isDashlPrefix
       ? ctx.searchLibrary(path._path) : ctx.searchFile(path._path, sysroot);
-    if (std::error_code ec = pathOrErr.getError())
-      return make_dynamic_error_code(
-        Twine("Unable to find file ") + path._path + ": " + ec.message());
+    if (std::error_code ec = pathOrErr.getError()) {
+      auto file = llvm::make_unique<ErrorFile>(path._path, ec);
+      ctx.getNodes().push_back(llvm::make_unique<FileNode>(std::move(file)));
+      ++numfiles;
+      continue;
+    }
 
     std::vector<std::unique_ptr<File>> files
       = loadFile(ctx, pathOrErr.get(), false);
@@ -266,20 +269,17 @@ evaluateLinkerScriptGroup(ELFLinkingCont
   return std::error_code();
 }
 
-static std::error_code
-evaluateLinkerScript(ELFLinkingContext &ctx, StringRef path,
-                     raw_ostream &diag) {
+std::error_code
+GnuLdDriver::evalLinkerScript(ELFLinkingContext &ctx,
+                              std::unique_ptr<MemoryBuffer> mb,
+                              raw_ostream &diag) {
   // Read the script file from disk and parse.
-  ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
-      MemoryBuffer::getFileOrSTDIN(path);
-  if (std::error_code ec = mb.getError())
-    return ec;
-  auto lexer = llvm::make_unique<script::Lexer>(std::move(mb.get()));
+  StringRef path = mb->getBufferIdentifier();
+  auto lexer = llvm::make_unique<script::Lexer>(std::move(mb));
   auto parser = llvm::make_unique<script::Parser>(*lexer);
   script::LinkerScript *script = parser->parse();
   if (!script)
     return LinkerScriptReaderError::parse_error;
-
   // Evaluate script commands.
   // Currently we only recognize GROUP() command.
   for (const script::Command *c : script->_commands)
@@ -623,7 +623,15 @@ bool GnuLdDriver::parse(int argc, const
       if (isScript) {
         if (ctx->logInputFiles())
           diagnostics << path << "\n";
-        std::error_code ec = evaluateLinkerScript(*ctx, realpath, diagnostics);
+        ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
+          MemoryBuffer::getFileOrSTDIN(path);
+        if (std::error_code ec = mb.getError()) {
+          diagnostics << "Cannot open " << path << ": "
+                      << ec.message() << "\n";
+          return false;
+        }
+        std::error_code ec = evalLinkerScript(*ctx, std::move(mb.get()),
+                                              diagnostics);
         if (ec) {
           diagnostics << path << ": Error parsing linker script: "
                       << ec.message() << "\n";

Modified: lld/trunk/unittests/DriverTests/GnuLdDriverTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/GnuLdDriverTest.cpp?rev=227341&r1=227340&r2=227341&view=diff
==============================================================================
--- lld/trunk/unittests/DriverTests/GnuLdDriverTest.cpp (original)
+++ lld/trunk/unittests/DriverTests/GnuLdDriverTest.cpp Wed Jan 28 12:38:50 2015
@@ -14,6 +14,7 @@
 
 #include "DriverTest.h"
 #include "lld/ReaderWriter/ELFLinkingContext.h"
+#include "llvm/Support/MemoryBuffer.h"
 
 using namespace llvm;
 using namespace lld;
@@ -145,3 +146,21 @@ TEST_F(GnuLdParserTest, DefsymMisssingSy
 TEST_F(GnuLdParserTest, DefsymMisssingValue) {
   EXPECT_FALSE(parse("ld", "a.o", "--defsym=sym=", nullptr));
 }
+
+// Linker script
+
+TEST_F(GnuLdParserTest, LinkerScriptGroup) {
+  parse("ld", "a.o", nullptr);
+  std::unique_ptr<MemoryBuffer> mb = MemoryBuffer::getMemBuffer(
+    "GROUP(/x /y)", "foo.so");
+  std::string s;
+  raw_string_ostream out(s);
+  std::error_code ec = GnuLdDriver::evalLinkerScript(
+    *_context, std::move(mb), out);
+  EXPECT_FALSE(ec);
+  std::vector<std::unique_ptr<Node>> &nodes = _context->getNodes();
+  EXPECT_EQ((size_t)4, nodes.size());
+  EXPECT_EQ("/x", cast<FileNode>(nodes[1].get())->getFile()->path());
+  EXPECT_EQ("/y", cast<FileNode>(nodes[2].get())->getFile()->path());
+  EXPECT_EQ(2, cast<GroupEnd>(nodes[3].get())->getSize());
+}