[ELF] Better error reporting for linker scripts
Differential revision: https://reviews.llvm.org/D26795
llvm-svn: 287547
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index ff58e44..38477c8 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -33,7 +33,6 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MathExtras.h"
-#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
#include <algorithm>
#include <cassert>
@@ -948,11 +947,12 @@
return 0;
}
-class elf::ScriptParser : public ScriptParserBase {
+class elf::ScriptParser final : public ScriptParserBase {
typedef void (ScriptParser::*Handler)();
public:
- ScriptParser(StringRef S, bool B) : ScriptParserBase(S), IsUnderSysroot(B) {}
+ ScriptParser(MemoryBufferRef MB, bool B)
+ : ScriptParserBase(MB), IsUnderSysroot(B) {}
void readLinkerScript();
void readVersionScript();
@@ -1006,6 +1006,7 @@
ScriptConfiguration &Opt = *ScriptConfig;
bool IsUnderSysroot;
+ std::vector<std::unique_ptr<MemoryBuffer>> OwningMBs;
};
void ScriptParser::readVersionScript() {
@@ -1148,9 +1149,8 @@
return;
}
std::unique_ptr<MemoryBuffer> &MB = *MBOrErr;
- StringRef S = Saver.save(MB->getMemBufferRef().getBuffer());
- std::vector<StringRef> V = tokenize(S);
- Tokens.insert(Tokens.begin() + Pos, V.begin(), V.end());
+ tokenize(MB->getMemBufferRef());
+ OwningMBs.push_back(std::move(MB));
}
void ScriptParser::readOutput() {
@@ -1912,11 +1912,11 @@
void elf::readLinkerScript(MemoryBufferRef MB) {
StringRef Path = MB.getBufferIdentifier();
- ScriptParser(MB.getBuffer(), isUnderSysroot(Path)).readLinkerScript();
+ ScriptParser(MB, isUnderSysroot(Path)).readLinkerScript();
}
void elf::readVersionScript(MemoryBufferRef MB) {
- ScriptParser(MB.getBuffer(), false).readVersionScript();
+ ScriptParser(MB, false).readVersionScript();
}
template class elf::LinkerScript<ELF32LE>;