Converted uses of scoped_ptr to OwningPtr.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45265 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/ASTConsumers.cpp b/Driver/ASTConsumers.cpp
index edababa..7a84321 100644
--- a/Driver/ASTConsumers.cpp
+++ b/Driver/ASTConsumers.cpp
@@ -663,23 +663,25 @@
// FIXME: This is not portable to Windows.
// FIXME: This logic should probably be moved elsewhere later.
- llvm::sys::Path ASTFile(EmitDir);
+ llvm::sys::Path FName(EmitDir);
std::vector<char> buf;
buf.reserve(strlen(FE->getName())+100);
sprintf(&buf[0], "dev_%llx", (uint64_t) FE->getDevice());
- ASTFile.appendComponent(&buf[0]);
- ASTFile.createDirectoryOnDisk(true);
- if (!ASTFile.canWrite() || !ASTFile.isDirectory()) {
+ FName.appendComponent(&buf[0]);
+ FName.createDirectoryOnDisk(true);
+ if (!FName.canWrite() || !FName.isDirectory()) {
assert (false && "Could not create 'device' serialization directory.");
return;
}
-
+
sprintf(&buf[0], "%s-%llX.ast", FE->getName(), (uint64_t) FE->getInode());
- ASTFile.appendComponent(&buf[0]);
+ FName.appendComponent(&buf[0]);
+ EmitASTBitcodeFile(TU,FName);
- EmitASTBitcodeFile(TU,ASTFile);
+ // Now emit the sources.
+
}
};
diff --git a/Driver/SerializationTest.cpp b/Driver/SerializationTest.cpp
index a668c74..06b6b1a 100644
--- a/Driver/SerializationTest.cpp
+++ b/Driver/SerializationTest.cpp
@@ -20,7 +20,7 @@
#include "ASTConsumers.h"
#include "clang/AST/TranslationUnit.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/ADT/scoped_ptr.h"
+#include "llvm/ADT/OwningPtr.h"
#include "llvm/Support/Streams.h"
#include <fstream>
@@ -71,7 +71,7 @@
// Pretty-print the decls to a temp file.
std::ofstream DeclPP(FNameDeclPrint.c_str());
assert (DeclPP && "Could not open file for printing out decls.");
- llvm::scoped_ptr<ASTConsumer> FilePrinter(CreateASTPrinter(&DeclPP));
+ llvm::OwningPtr<ASTConsumer> FilePrinter(CreateASTPrinter(&DeclPP));
for (TranslationUnit::iterator I=TU.begin(), E=TU.end(); I!=E; ++I)
FilePrinter->HandleTopLevelDecl(*I);
@@ -94,7 +94,7 @@
// Pretty-print the deserialized decls to a temp file.
std::ofstream DeclPP(FNameDeclPrint.c_str());
assert (DeclPP && "Could not open file for printing out decls.");
- llvm::scoped_ptr<ASTConsumer> FilePrinter(CreateASTPrinter(&DeclPP));
+ llvm::OwningPtr<ASTConsumer> FilePrinter(CreateASTPrinter(&DeclPP));
for (TranslationUnit::iterator I=NewTU->begin(), E=NewTU->end(); I!=E; ++I)
FilePrinter->HandleTopLevelDecl(*I);
@@ -162,7 +162,7 @@
using llvm::MemoryBuffer;
- llvm::scoped_ptr<MemoryBuffer>
+ llvm::OwningPtr<MemoryBuffer>
MBufferSer(MemoryBuffer::getFile(FNameDeclBefore.c_str(),
strlen(FNameDeclBefore.c_str())));
@@ -171,7 +171,7 @@
return;
}
- llvm::scoped_ptr<MemoryBuffer>
+ llvm::OwningPtr<MemoryBuffer>
MBufferDSer(MemoryBuffer::getFile(FNameDeclAfter.c_str(),
strlen(FNameDeclAfter.c_str())));
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 4ac14ad..91bd117 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -39,7 +39,7 @@
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Signals.h"
#include "llvm/Config/config.h"
-#include "llvm/ADT/scoped_ptr.h"
+#include "llvm/ADT/OwningPtr.h"
#include <memory>
using namespace clang;
@@ -1040,7 +1040,7 @@
exit (1);
}
- llvm::scoped_ptr<TranslationUnit> TU(ReadASTBitcodeFile(Filename,FileMgr));
+ llvm::OwningPtr<TranslationUnit> TU(ReadASTBitcodeFile(Filename,FileMgr));
if (!TU) {
fprintf(stderr, "error: file '%s' could not be deserialized\n",
@@ -1050,7 +1050,7 @@
// Observe that we use the source file name stored in the deserialized
// translation unit, rather than InFile.
- llvm::scoped_ptr<ASTConsumer>
+ llvm::OwningPtr<ASTConsumer>
Consumer(CreateASTConsumer(InFile, Diag, FileMgr, TU->getLangOpts()));
if (!Consumer) {