[cfe-commits] r45265 - in /cfe/trunk: AST/TranslationUnit.cpp Driver/ASTConsumers.cpp Driver/SerializationTest.cpp Driver/clang.cpp Lex/HeaderMap.cpp
Ted Kremenek
kremenek at apple.com
Thu Dec 20 11:47:16 PST 2007
Author: kremenek
Date: Thu Dec 20 13:47:16 2007
New Revision: 45265
URL: http://llvm.org/viewvc/llvm-project?rev=45265&view=rev
Log:
Converted uses of scoped_ptr to OwningPtr.
Modified:
cfe/trunk/AST/TranslationUnit.cpp
cfe/trunk/Driver/ASTConsumers.cpp
cfe/trunk/Driver/SerializationTest.cpp
cfe/trunk/Driver/clang.cpp
cfe/trunk/Lex/HeaderMap.cpp
Modified: cfe/trunk/AST/TranslationUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/AST/TranslationUnit.cpp?rev=45265&r1=45264&r2=45265&view=diff
==============================================================================
--- cfe/trunk/AST/TranslationUnit.cpp (original)
+++ cfe/trunk/AST/TranslationUnit.cpp Thu Dec 20 13:47:16 2007
@@ -20,7 +20,7 @@
#include "llvm/Bitcode/Deserialize.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Path.h"
-#include "llvm/ADT/scoped_ptr.h"
+#include "llvm/ADT/OwningPtr.h"
#include <stdio.h>
@@ -125,7 +125,7 @@
clang::ReadASTBitcodeFile(const llvm::sys::Path& Filename, FileManager& FMgr) {
// Create the memory buffer that contains the contents of the file.
- llvm::scoped_ptr<llvm::MemoryBuffer>
+ llvm::OwningPtr<llvm::MemoryBuffer>
MBuffer(llvm::MemoryBuffer::getFile(Filename.c_str(),
strlen(Filename.c_str())));
Modified: cfe/trunk/Driver/ASTConsumers.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/ASTConsumers.cpp?rev=45265&r1=45264&r2=45265&view=diff
==============================================================================
--- cfe/trunk/Driver/ASTConsumers.cpp (original)
+++ cfe/trunk/Driver/ASTConsumers.cpp Thu Dec 20 13:47:16 2007
@@ -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);
+
+ // Now emit the sources.
- EmitASTBitcodeFile(TU,ASTFile);
}
};
Modified: cfe/trunk/Driver/SerializationTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/SerializationTest.cpp?rev=45265&r1=45264&r2=45265&view=diff
==============================================================================
--- cfe/trunk/Driver/SerializationTest.cpp (original)
+++ cfe/trunk/Driver/SerializationTest.cpp Thu Dec 20 13:47:16 2007
@@ -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())));
Modified: cfe/trunk/Driver/clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/clang.cpp?rev=45265&r1=45264&r2=45265&view=diff
==============================================================================
--- cfe/trunk/Driver/clang.cpp (original)
+++ cfe/trunk/Driver/clang.cpp Thu Dec 20 13:47:16 2007
@@ -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) {
Modified: cfe/trunk/Lex/HeaderMap.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Lex/HeaderMap.cpp?rev=45265&r1=45264&r2=45265&view=diff
==============================================================================
--- cfe/trunk/Lex/HeaderMap.cpp (original)
+++ cfe/trunk/Lex/HeaderMap.cpp Thu Dec 20 13:47:16 2007
@@ -13,7 +13,7 @@
#include "clang/Lex/HeaderMap.h"
#include "clang/Basic/FileManager.h"
-#include "llvm/ADT/scoped_ptr.h"
+#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/MathExtras.h"
@@ -78,7 +78,7 @@
unsigned FileSize = FE->getSize();
if (FileSize <= sizeof(HMapHeader)) return 0;
- llvm::scoped_ptr<const llvm::MemoryBuffer> FileBuffer(
+ llvm::OwningPtr<const llvm::MemoryBuffer> FileBuffer(
llvm::MemoryBuffer::getFile(FE->getName(), strlen(FE->getName()), 0,
FE->getSize()));
if (FileBuffer == 0) return 0; // Unreadable file?
More information about the cfe-commits
mailing list