diff options
| -rw-r--r-- | include/clang/AST/TranslationUnit.h | 8 | ||||
| -rw-r--r-- | lib/AST/ASTContext.cpp | 3 | ||||
| -rw-r--r-- | lib/AST/TranslationUnit.cpp | 7 | ||||
| -rw-r--r-- | tools/clang-cc/RewriteObjC.cpp | 1 |
4 files changed, 6 insertions, 13 deletions
diff --git a/include/clang/AST/TranslationUnit.h b/include/clang/AST/TranslationUnit.h index 9c356a20fd..33cb47b9e5 100644 --- a/include/clang/AST/TranslationUnit.h +++ b/include/clang/AST/TranslationUnit.h @@ -33,17 +33,13 @@ class FileEntry; class TranslationUnit { ASTContext* Context; bool OwnsMetaData; - bool OwnsDecls; // The default ctor is only invoked during deserialization. - explicit TranslationUnit() : Context(NULL), OwnsMetaData(true), - OwnsDecls(true) {} + explicit TranslationUnit() : Context(NULL), OwnsMetaData(true){} public: explicit TranslationUnit(ASTContext& Ctx) - : Context(&Ctx), OwnsMetaData(false), OwnsDecls(true) {} - - void SetOwnsDecls(bool val) { OwnsDecls = val; } + : Context(&Ctx), OwnsMetaData(false) {} ~TranslationUnit(); diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index da6e049732..3fe6db8342 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -35,8 +35,7 @@ ASTContext::ASTContext(const LangOptions& LOpts, SourceManager &SM, bool FreeMem, unsigned size_reserve) : GlobalNestedNameSpecifier(0), CFConstantStringTypeDecl(0), ObjCFastEnumerationStateTypeDecl(0), SourceMgr(SM), LangOpts(LOpts), - FreeMemory(FreeMem), Target(t), Idents(idents), Selectors(sels) -{ + FreeMemory(FreeMem), Target(t), Idents(idents), Selectors(sels) { if (size_reserve > 0) Types.reserve(size_reserve); InitBuiltinTypes(); BuiltinInfo.InitializeBuiltins(idents, Target, LangOpts.NoBuiltin); diff --git a/lib/AST/TranslationUnit.cpp b/lib/AST/TranslationUnit.cpp index 95cad39f68..ed84241df4 100644 --- a/lib/AST/TranslationUnit.cpp +++ b/lib/AST/TranslationUnit.cpp @@ -35,10 +35,9 @@ TranslationUnit::~TranslationUnit() { // The ASTContext object has the sole references to the IdentifierTable // Selectors, and the Target information. Go and delete them, since // the TranslationUnit effectively owns them. - - delete &(Context->Idents); - delete &(Context->Selectors); - delete &(Context->Target); + delete &Context->Idents; + delete &Context->Selectors; + delete &Context->Target; delete Context; } } diff --git a/tools/clang-cc/RewriteObjC.cpp b/tools/clang-cc/RewriteObjC.cpp index c3cc2c3852..2ce983ca85 100644 --- a/tools/clang-cc/RewriteObjC.cpp +++ b/tools/clang-cc/RewriteObjC.cpp @@ -127,7 +127,6 @@ namespace { virtual void Initialize(ASTContext &context); virtual void InitializeTU(TranslationUnit &TU) { - TU.SetOwnsDecls(false); Initialize(TU.getContext()); } |