summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--clang/include/clang/AST/ASTContext.h8
-rw-r--r--clang/include/clang/AST/TranslationUnit.h11
-rw-r--r--clang/lib/AST/ASTConsumer.cpp1
-rw-r--r--clang/lib/AST/ASTContext.cpp45
-rw-r--r--clang/lib/AST/TranslationUnit.cpp65
-rw-r--r--clang/lib/Sema/ParseAST.cpp1
-rw-r--r--clang/tools/clang-cc/ASTConsumers.cpp8
-rw-r--r--clang/tools/clang-cc/Backend.cpp1
-rw-r--r--clang/tools/clang-cc/SerializationTest.cpp14
-rw-r--r--clang/tools/clang-cc/clang.cpp14
10 files changed, 67 insertions, 101 deletions
diff --git a/clang/include/clang/AST/ASTContext.h b/clang/include/clang/AST/ASTContext.h
index 2c239b255a3..bb2d80e7d1f 100644
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -676,12 +676,12 @@ public:
// Serialization
//===--------------------------------------------------------------------===//
- void EmitAll(llvm::Serializer& S) const;
- static ASTContext* CreateAll(llvm::Deserializer &D,
- FileManager &FMgr);
+ void EmitASTBitcodeBuffer(std::vector<unsigned char> &Buffer) const;
+ static ASTContext *ReadASTBitcodeBuffer(llvm::MemoryBuffer &MBuffer,
+ FileManager &FMgr);
void Emit(llvm::Serializer& S) const;
- static ASTContext* Create(llvm::Deserializer& D);
+ static ASTContext *Create(llvm::Deserializer& D);
//===--------------------------------------------------------------------===//
// Integer Values
diff --git a/clang/include/clang/AST/TranslationUnit.h b/clang/include/clang/AST/TranslationUnit.h
index 5ebcfa649dc..bd282cf0ebf 100644
--- a/clang/include/clang/AST/TranslationUnit.h
+++ b/clang/include/clang/AST/TranslationUnit.h
@@ -45,7 +45,7 @@ public:
const std::string& getSourceFile() const;
/// Create - Reconsititute a translation unit from a bitcode stream.
- static TranslationUnit* Create(llvm::Deserializer& D, FileManager& FMgr);
+ //static TranslationUnit* Create(llvm::Deserializer& D, FileManager& FMgr);
// Accessors
const LangOptions& getLangOptions() const { return Context->getLangOptions();}
@@ -60,15 +60,6 @@ public:
iterator end() const { return Context->getTranslationUnitDecl()->decls_end(); }
};
-/// EmitASTBitcodeBuffer - Emit a translation unit to a buffer.
-bool EmitASTBitcodeBuffer(const ASTContext &Ctx,
- std::vector<unsigned char>& Buffer);
-
-/// ReadASTBitcodeBuffer - Reconsitute a translation unit from a buffer.
-TranslationUnit* ReadASTBitcodeBuffer(llvm::MemoryBuffer& MBuffer,
- FileManager& FMgr);
-
-
} // end namespace clang
#endif
diff --git a/clang/lib/AST/ASTConsumer.cpp b/clang/lib/AST/ASTConsumer.cpp
index b3919f17714..6c44d1ab7b0 100644
--- a/clang/lib/AST/ASTConsumer.cpp
+++ b/clang/lib/AST/ASTConsumer.cpp
@@ -13,7 +13,6 @@
#include "clang/AST/ASTConsumer.h"
#include "clang/AST/Decl.h"
-#include "clang/AST/TranslationUnit.h"
using namespace clang;
ASTConsumer::~ASTConsumer() {}
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 9f8630f58fc..f3cf6b18eb0 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -23,6 +23,7 @@
#include "llvm/Bitcode/Serialize.h"
#include "llvm/Bitcode/Deserialize.h"
#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/MemoryBuffer.h"
using namespace clang;
enum FloatingRank {
@@ -3086,7 +3087,21 @@ enum {
DeclsBlock = 3
};
-void ASTContext::EmitAll(llvm::Serializer &S) const {
+void ASTContext::EmitASTBitcodeBuffer(std::vector<unsigned char> &Buffer) const{
+ // Create bitstream.
+ llvm::BitstreamWriter Stream(Buffer);
+
+ // Emit the preamble.
+ Stream.Emit((unsigned)'B', 8);
+ Stream.Emit((unsigned)'C', 8);
+ Stream.Emit(0xC, 4);
+ Stream.Emit(0xF, 4);
+ Stream.Emit(0xE, 4);
+ Stream.Emit(0x0, 4);
+
+ // Create serializer.
+ llvm::Serializer S(Stream);
+
// ===---------------------------------------------------===/
// Serialize the "Translation Unit" metadata.
// ===---------------------------------------------------===/
@@ -3142,8 +3157,32 @@ void ASTContext::Emit(llvm::Serializer& S) const {
// FIXME: S.EmitOwnedPtr(CFConstantStringTypeDecl);
}
-ASTContext* ASTContext::CreateAll(llvm::Deserializer &Dezr,
- FileManager &FMgr) {
+
+ASTContext *ASTContext::ReadASTBitcodeBuffer(llvm::MemoryBuffer &Buffer,
+ FileManager &FMgr) {
+ // Check if the file is of the proper length.
+ if (Buffer.getBufferSize() & 0x3) {
+ // FIXME: Provide diagnostic: "Length should be a multiple of 4 bytes."
+ return 0;
+ }
+
+ // Create the bitstream reader.
+ unsigned char *BufPtr = (unsigned char *)Buffer.getBufferStart();
+ llvm::BitstreamReader Stream(BufPtr, BufPtr+Buffer.getBufferSize());
+
+ if (Stream.Read(8) != 'B' ||
+ Stream.Read(8) != 'C' ||
+ Stream.Read(4) != 0xC ||
+ Stream.Read(4) != 0xF ||
+ Stream.Read(4) != 0xE ||
+ Stream.Read(4) != 0x0) {
+ // FIXME: Provide diagnostic.
+ return NULL;
+ }
+
+ // Create the deserializer.
+ llvm::Deserializer Dezr(Stream);
+
// ===---------------------------------------------------===/
// Deserialize the "Translation Unit" metadata.
// ===---------------------------------------------------===/
diff --git a/clang/lib/AST/TranslationUnit.cpp b/clang/lib/AST/TranslationUnit.cpp
index 57f9f4ebc80..0c69432014d 100644
--- a/clang/lib/AST/TranslationUnit.cpp
+++ b/clang/lib/AST/TranslationUnit.cpp
@@ -29,68 +29,3 @@ using namespace clang;
TranslationUnit::~TranslationUnit() {
}
-
-bool clang::EmitASTBitcodeBuffer(const ASTContext &Ctx,
- std::vector<unsigned char>& Buffer) {
- // Create bitstream.
- llvm::BitstreamWriter Stream(Buffer);
-
- // Emit the preamble.
- Stream.Emit((unsigned)'B', 8);
- Stream.Emit((unsigned)'C', 8);
- Stream.Emit(0xC, 4);
- Stream.Emit(0xF, 4);
- Stream.Emit(0xE, 4);
- Stream.Emit(0x0, 4);
-
- {
- // Create serializer. Placing it in its own scope assures any necessary
- // finalization of bits to the buffer in the serializer's dstor.
- llvm::Serializer Sezr(Stream);
-
- // Emit the translation unit.
- Ctx.EmitAll(Sezr);
- }
-
- return true;
-}
-
-TranslationUnit*
-clang::ReadASTBitcodeBuffer(llvm::MemoryBuffer& MBuffer, FileManager& FMgr) {
-
- // Check if the file is of the proper length.
- if (MBuffer.getBufferSize() & 0x3) {
- // FIXME: Provide diagnostic: "Length should be a multiple of 4 bytes."
- return NULL;
- }
-
- // Create the bitstream reader.
- unsigned char *BufPtr = (unsigned char *) MBuffer.getBufferStart();
- llvm::BitstreamReader Stream(BufPtr,BufPtr+MBuffer.getBufferSize());
-
- if (Stream.Read(8) != 'B' ||
- Stream.Read(8) != 'C' ||
- Stream.Read(4) != 0xC ||
- Stream.Read(4) != 0xF ||
- Stream.Read(4) != 0xE ||
- Stream.Read(4) != 0x0) {
- // FIXME: Provide diagnostic.
- return NULL;
- }
-
- // Create the deserializer.
- llvm::Deserializer Dezr(Stream);
-
- return TranslationUnit::Create(Dezr,FMgr);
-}
-
-TranslationUnit* TranslationUnit::Create(llvm::Deserializer& Dezr,
- FileManager& FMgr) {
-
- // Create the translation unit object.
- TranslationUnit* TU = new TranslationUnit();
-
- TU->Context = ASTContext::CreateAll(Dezr, FMgr);
-
- return TU;
-}
diff --git a/clang/lib/Sema/ParseAST.cpp b/clang/lib/Sema/ParseAST.cpp
index bcff1c8cfbc..fdc57b6e248 100644
--- a/clang/lib/Sema/ParseAST.cpp
+++ b/clang/lib/Sema/ParseAST.cpp
@@ -15,7 +15,6 @@
#include "clang/Sema/ParseAST.h"
#include "clang/AST/ASTConsumer.h"
#include "clang/AST/Stmt.h"
-#include "clang/AST/TranslationUnit.h"
#include "Sema.h"
#include "clang/Parse/Parser.h"
using namespace clang;
diff --git a/clang/tools/clang-cc/ASTConsumers.cpp b/clang/tools/clang-cc/ASTConsumers.cpp
index 18b4246cb6c..5b4287a2bd1 100644
--- a/clang/tools/clang-cc/ASTConsumers.cpp
+++ b/clang/tools/clang-cc/ASTConsumers.cpp
@@ -13,18 +13,18 @@
#include "ASTConsumers.h"
#include "clang/Frontend/PathDiagnosticClients.h"
-#include "clang/AST/TranslationUnit.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Basic/FileManager.h"
#include "clang/AST/AST.h"
#include "clang/AST/ASTConsumer.h"
+#include "clang/AST/ASTContext.h"
#include "clang/CodeGen/ModuleBuilder.h"
#include "llvm/Module.h"
#include "llvm/Support/Streams.h"
#include "llvm/Support/Timer.h"
#include "llvm/Support/raw_ostream.h"
-
+#include "llvm/System/Path.h"
using namespace clang;
//===----------------------------------------------------------------------===//
@@ -981,7 +981,7 @@ public:
std::vector<unsigned char> Buffer;
Buffer.reserve(256*1024);
- EmitASTBitcodeBuffer(Ctx, Buffer);
+ Ctx.EmitASTBitcodeBuffer(Buffer);
// Write the bits to disk.
if (FILE* fp = fopen(FName.c_str(),"wb")) {
@@ -1032,7 +1032,7 @@ public:
std::vector<unsigned char> Buffer;
Buffer.reserve(256*1024);
- EmitASTBitcodeBuffer(Ctx, Buffer);
+ Ctx.EmitASTBitcodeBuffer(Buffer);
// Write the bits to disk.
if (FILE* fp = fopen(FName.c_str(),"wb")) {
diff --git a/clang/tools/clang-cc/Backend.cpp b/clang/tools/clang-cc/Backend.cpp
index ee2d0c56b26..0faabbe8d58 100644
--- a/clang/tools/clang-cc/Backend.cpp
+++ b/clang/tools/clang-cc/Backend.cpp
@@ -10,7 +10,6 @@
#include "ASTConsumers.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/TranslationUnit.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/CodeGen/ModuleBuilder.h"
#include "clang/Frontend/CompileOptions.h"
diff --git a/clang/tools/clang-cc/SerializationTest.cpp b/clang/tools/clang-cc/SerializationTest.cpp
index d12a0af306b..a39811fd90e 100644
--- a/clang/tools/clang-cc/SerializationTest.cpp
+++ b/clang/tools/clang-cc/SerializationTest.cpp
@@ -81,7 +81,7 @@ bool SerializationTest::Serialize(llvm::sys::Path& Filename,
std::vector<unsigned char> Buffer;
Buffer.reserve(256*1024);
- EmitASTBitcodeBuffer(Ctx, Buffer);
+ Ctx.EmitASTBitcodeBuffer(Buffer);
// Write the bits to disk.
if (FILE* fp = fopen(Filename.c_str(),"wb")) {
@@ -97,7 +97,7 @@ bool SerializationTest::Deserialize(llvm::sys::Path& Filename,
llvm::sys::Path& FNameDeclPrint) {
// Deserialize the translation unit.
- TranslationUnit* NewTU;
+ ASTContext *NewCtx;
{
// Create the memory buffer that contains the contents of the file.
@@ -107,10 +107,10 @@ bool SerializationTest::Deserialize(llvm::sys::Path& Filename,
if (!MBuffer)
return false;
- NewTU = ReadASTBitcodeBuffer(*MBuffer, FMgr);
+ NewCtx = ASTContext::ReadASTBitcodeBuffer(*MBuffer, FMgr);
}
- if (!NewTU)
+ if (!NewCtx)
return false;
{
@@ -120,11 +120,13 @@ bool SerializationTest::Deserialize(llvm::sys::Path& Filename,
assert (Err.empty() && "Could not open file for printing out decls.");
llvm::OwningPtr<ASTConsumer> FilePrinter(CreateASTPrinter(&DeclPP));
- for (TranslationUnit::iterator I=NewTU->begin(), E=NewTU->end(); I!=E; ++I)
+ TranslationUnitDecl *TUD = NewCtx->getTranslationUnitDecl();
+ for (DeclContext::decl_iterator I = TUD->decls_begin(), E = TUD->decls_end();
+ I != E; ++I)
FilePrinter->HandleTopLevelDecl(*I);
}
- delete NewTU;
+ delete NewCtx;
return true;
}
diff --git a/clang/tools/clang-cc/clang.cpp b/clang/tools/clang-cc/clang.cpp
index 9ab1dd39a46..31a39587662 100644
--- a/clang/tools/clang-cc/clang.cpp
+++ b/clang/tools/clang-cc/clang.cpp
@@ -1531,16 +1531,16 @@ static void ProcessSerializedFile(const std::string& InFile, Diagnostic& Diag,
exit (1);
}
- llvm::OwningPtr<TranslationUnit> TU;
+ llvm::OwningPtr<ASTContext> Ctx;
// Create the memory buffer that contains the contents of the file.
llvm::OwningPtr<llvm::MemoryBuffer>
MBuffer(llvm::MemoryBuffer::getFile(Filename.c_str()));
if (MBuffer)
- TU.reset(ReadASTBitcodeBuffer(*MBuffer, FileMgr));
+ Ctx.reset(ASTContext::ReadASTBitcodeBuffer(*MBuffer, FileMgr));
- if (!TU) {
+ if (!Ctx) {
fprintf(stderr, "error: file '%s' could not be deserialized\n",
InFile.c_str());
exit (1);
@@ -1549,7 +1549,7 @@ static void ProcessSerializedFile(const std::string& InFile, Diagnostic& Diag,
// Observe that we use the source file name stored in the deserialized
// translation unit, rather than InFile.
llvm::OwningPtr<ASTConsumer>
- Consumer(CreateASTConsumer(InFile, Diag, FileMgr, TU->getLangOptions(),
+ Consumer(CreateASTConsumer(InFile, Diag, FileMgr, Ctx->getLangOptions(),
0, 0));
if (!Consumer) {
@@ -1557,10 +1557,12 @@ static void ProcessSerializedFile(const std::string& InFile, Diagnostic& Diag,
exit (1);
}
- Consumer->Initialize(TU->getContext());
+ Consumer->Initialize(*Ctx);
// FIXME: We need to inform Consumer about completed TagDecls as well.
- for (TranslationUnit::iterator I=TU->begin(), E=TU->end(); I!=E; ++I)
+ TranslationUnitDecl *TUD = Ctx->getTranslationUnitDecl();
+ for (DeclContext::decl_iterator I = TUD->decls_begin(), E = TUD->decls_end();
+ I != E; ++I)
Consumer->HandleTopLevelDecl(*I);
}
OpenPOWER on IntegriCloud