maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

do not serialize invalid asts. this fixes bug #2637 

llvm-svn: 54590
This commit is contained in:
Nico Weber 2008-08-09 18:32:11 +00:00
parent 09e3b65a99
commit 7094a5bfa8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/Driver/ASTConsumers.cpp
View File

@ -14,6 +14,7 @@
#include "ASTConsumers.h" #include "ASTConsumers.h"
#include "HTMLDiagnostics.h" #include "HTMLDiagnostics.h"
#include "clang/AST/TranslationUnit.h" #include "clang/AST/TranslationUnit.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/SourceManager.h" #include "clang/Basic/SourceManager.h"
#include "clang/Basic/FileManager.h" #include "clang/Basic/FileManager.h"
#include "clang/AST/AST.h" #include "clang/AST/AST.h"
@ -526,9 +527,10 @@ namespace {
class ASTSerializer : public ASTConsumer { class ASTSerializer : public ASTConsumer {
protected: protected:
TranslationUnit* TU; TranslationUnit* TU;
Diagnostic& Diags;
public: public:
ASTSerializer() : TU(0) {} ASTSerializer(Diagnostic& diags) : TU(0), Diags(diags) {}
virtual void InitializeTU(TranslationUnit &tu) { virtual void InitializeTU(TranslationUnit &tu) {
TU = &tu; TU = &tu;
@ -539,9 +541,12 @@ public:
class SingleFileSerializer : public ASTSerializer { class SingleFileSerializer : public ASTSerializer {
const llvm::sys::Path FName; const llvm::sys::Path FName;
public: public:
SingleFileSerializer(const llvm::sys::Path& F) : FName(F) {} SingleFileSerializer(const llvm::sys::Path& F, Diagnostic& diags)
: ASTSerializer(diags), FName(F) {}
~SingleFileSerializer() { ~SingleFileSerializer() {
if (Diags.hasErrorOccurred())
return;
EmitASTBitcodeFile(TU, FName); EmitASTBitcodeFile(TU, FName);
} }
}; };
@ -549,11 +554,12 @@ public:
class BuildSerializer : public ASTSerializer { class BuildSerializer : public ASTSerializer {
llvm::sys::Path EmitDir; llvm::sys::Path EmitDir;
public: public:
BuildSerializer(const llvm::sys::Path& dir) : EmitDir(dir) {} BuildSerializer(const llvm::sys::Path& dir, Diagnostic& diags)
: ASTSerializer(diags), EmitDir(dir) {}
~BuildSerializer() { ~BuildSerializer() {
if (!TU) if (!TU || Diags.hasErrorOccurred())
return; return;
SourceManager& SourceMgr = TU->getContext().getSourceManager(); SourceManager& SourceMgr = TU->getContext().getSourceManager();
@ -624,7 +630,7 @@ ASTConsumer* clang::CreateASTSerializer(const std::string& InFile,
// FIXME: We should probably only allow using BuildSerializer when // FIXME: We should probably only allow using BuildSerializer when
// the ASTs come from parsed source files, and not from .ast files. // the ASTs come from parsed source files, and not from .ast files.
return new BuildSerializer(EmitDir); return new BuildSerializer(EmitDir, Diags);
} }
// The user did not specify an output directory for serialized ASTs. // The user did not specify an output directory for serialized ASTs.
@ -633,7 +639,7 @@ ASTConsumer* clang::CreateASTSerializer(const std::string& InFile,
llvm::sys::Path FName(InFile.c_str()); llvm::sys::Path FName(InFile.c_str());
FName.appendSuffix("ast"); FName.appendSuffix("ast");
return new SingleFileSerializer(FName); return new SingleFileSerializer(FName, Diags);
} }
class LLVMCodeGenWriter : public ASTConsumer { class LLVMCodeGenWriter : public ASTConsumer {