summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2014-08-21 21:01:00 +0000
committerDavid Blaikie <dblaikie@gmail.com>2014-08-21 21:01:00 +0000
commit9e095d9b6bf8a47c0b2ea6b792188f793efdb4a3 (patch)
treea973489b465ac22860ea176ceb77210901af424f
parentaddb75a4f32ce093a4939f4253a99deecdd1666f (diff)
downloadbcm5719-llvm-9e095d9b6bf8a47c0b2ea6b792188f793efdb4a3.tar.gz
bcm5719-llvm-9e095d9b6bf8a47c0b2ea6b792188f793efdb4a3.zip
Update Clang for LLVM API change to use unique_ptr in SourceManager::AddNewSourceBuffer
llvm-svn: 216226
-rw-r--r--clang/lib/Parse/ParseStmtAsm.cpp6
-rw-r--r--clang/tools/driver/cc1as_main.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseStmtAsm.cpp b/clang/lib/Parse/ParseStmtAsm.cpp
index f1d2946e0e5..584b9e029bd 100644
--- a/clang/lib/Parse/ParseStmtAsm.cpp
+++ b/clang/lib/Parse/ParseStmtAsm.cpp
@@ -498,11 +498,11 @@ StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) {
llvm::SourceMgr TempSrcMgr;
llvm::MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &TempSrcMgr);
- llvm::MemoryBuffer *Buffer =
- llvm::MemoryBuffer::getMemBuffer(AsmString, "<MS inline asm>");
+ std::unique_ptr<llvm::MemoryBuffer> Buffer(
+ llvm::MemoryBuffer::getMemBuffer(AsmString, "<MS inline asm>"));
// Tell SrcMgr about this buffer, which is what the parser will pick up.
- TempSrcMgr.AddNewSourceBuffer(Buffer, llvm::SMLoc());
+ TempSrcMgr.AddNewSourceBuffer(std::move(Buffer), llvm::SMLoc());
std::unique_ptr<llvm::MCStreamer> Str(createNullStreamer(Ctx));
std::unique_ptr<llvm::MCAsmParser> Parser(
diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp
index 847eb890d40..91b66f578c4 100644
--- a/clang/tools/driver/cc1as_main.cpp
+++ b/clang/tools/driver/cc1as_main.cpp
@@ -295,7 +295,7 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts,
SourceMgr SrcMgr;
// Tell SrcMgr about this buffer, which is what the parser will pick up.
- SrcMgr.AddNewSourceBuffer(Buffer->release(), SMLoc());
+ SrcMgr.AddNewSourceBuffer(std::move(*Buffer), SMLoc());
// Record the location of the include directories so that the lexer can find
// it later.
OpenPOWER on IntegriCloud