summaryrefslogtreecommitdiffstats
path: root/lld/lib/Driver/WinLinkDriver.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-06-13 12:50:13 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-06-13 12:50:13 +0000
commit9bd82e9952fbbeeace03dd8422fda6c48582b127 (patch)
tree38aaddc1a605bf03cee5c8c9f00a6ff283dd4f3c /lld/lib/Driver/WinLinkDriver.cpp
parent2b098e4606358b1ee2f76fd3714fc5f5df26ed47 (diff)
downloadbcm5719-llvm-9bd82e9952fbbeeace03dd8422fda6c48582b127.tar.gz
bcm5719-llvm-9bd82e9952fbbeeace03dd8422fda6c48582b127.zip
Update for llvm api change.
llvm-svn: 239671
Diffstat (limited to 'lld/lib/Driver/WinLinkDriver.cpp')
-rw-r--r--lld/lib/Driver/WinLinkDriver.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp
index 7bc26bb24b0..80bd0b3d250 100644
--- a/lld/lib/Driver/WinLinkDriver.cpp
+++ b/lld/lib/Driver/WinLinkDriver.cpp
@@ -29,6 +29,7 @@
#include "llvm/Support/Path.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/Program.h"
+#include "llvm/Support/StringSaver.h"
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
#include <cctype>
@@ -694,20 +695,6 @@ static void processLibEnv(PECOFFLinkingContext &ctx) {
ctx.appendInputSearchPath(ctx.allocate(path));
}
-namespace {
-class DriverStringSaver : public llvm::cl::StringSaver {
-public:
- DriverStringSaver(PECOFFLinkingContext &ctx) : _ctx(ctx) {}
-
- const char *SaveString(const char *s) override {
- return _ctx.allocate(StringRef(s)).data();
- }
-
-private:
- PECOFFLinkingContext &_ctx;
-};
-}
-
// Tokenize command line options in a given file and add them to result.
static bool readResponseFile(StringRef path, PECOFFLinkingContext &ctx,
std::vector<const char *> &result) {
@@ -716,7 +703,7 @@ static bool readResponseFile(StringRef path, PECOFFLinkingContext &ctx,
return false;
StringRef contentsStr(reinterpret_cast<const char *>(contents.data()),
contents.size());
- DriverStringSaver saver(ctx);
+ llvm::BumpPtrStringSaver saver(ctx.getAllocator());
SmallVector<const char *, 0> args;
llvm::cl::TokenizeWindowsCommandLine(contentsStr, saver, args);
for (const char *s : args)
OpenPOWER on IntegriCloud