diff options
author | Ted Kremenek <kremenek@apple.com> | 2011-11-17 23:01:24 +0000 |
---|---|---|
committer | Ted Kremenek <kremenek@apple.com> | 2011-11-17 23:01:24 +0000 |
commit | d3b74d9ca4f239a7a90ad193378c494306c57352 (patch) | |
tree | 65d677835cc2b3e9625285be0f165d5b6e9e8a65 /tools | |
parent | d04a982d3472d98e58f58dfc327ca11e236980f5 (diff) | |
download | clang-d3b74d9ca4f239a7a90ad193378c494306c57352.tar.gz clang-d3b74d9ca4f239a7a90ad193378c494306c57352.tar.bz2 clang-d3b74d9ca4f239a7a90ad193378c494306c57352.tar.xz |
Make 'LangOptions' in CompilerInvocation a heap-allocated, reference counted object. I discovered that llvm::RefCountedBase<T> has
a bug where the reference count is copied in the copy constructor, which means that there were cases when the CompilerInvocation
objects created by ASTUnit were actually leaked. When I fixed that bug locally, it showed that a whole bunch of code assumed
that the LangOptions object that was part of CompilerInvocation was still alive. By making it heap-allocated and reference counted,
we can keep it around after the CompilerInvocation object goes away.
As part of this change, change CompilerInvocation:getLangOptions() to return a pointer, acting as another clue that this
object may outlive the CompilerInvocation object.
This commit doesn't fix the CompilerInvocation leak itself. That will come when I commit the fix to llvm::RefCountedBase<T> to
mainline LLVM.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@144930 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/arcmt-test/arcmt-test.cpp | 6 | ||||
-rw-r--r-- | tools/libclang/Indexing.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/arcmt-test/arcmt-test.cpp b/tools/arcmt-test/arcmt-test.cpp index e47e815d35..3f91fcf124 100644 --- a/tools/arcmt-test/arcmt-test.cpp +++ b/tools/arcmt-test/arcmt-test.cpp @@ -125,7 +125,7 @@ static bool checkForMigration(StringRef resourcesPath, return true; } - if (!CI.getLangOpts().ObjC1) + if (!CI.getLangOpts()->ObjC1) return false; arcmt::checkForManualIssues(CI, @@ -167,13 +167,13 @@ static bool performTransformations(StringRef resourcesPath, return true; } - if (!origCI.getLangOpts().ObjC1) + if (!origCI.getLangOpts()->ObjC1) return false; MigrationProcess migration(origCI, DiagClient); std::vector<TransformFn> - transforms = arcmt::getAllTransformations(origCI.getLangOpts().getGC()); + transforms = arcmt::getAllTransformations(origCI.getLangOpts()->getGC()); assert(!transforms.empty()); llvm::OwningPtr<PrintTransforms> transformPrinter; diff --git a/tools/libclang/Indexing.cpp b/tools/libclang/Indexing.cpp index 1eb3da21b4..4540f9731d 100644 --- a/tools/libclang/Indexing.cpp +++ b/tools/libclang/Indexing.cpp @@ -333,7 +333,7 @@ static void clang_indexSourceFile_Impl(void *UserData) { // (often very broken) source code, where spell-checking can have a // significant negative impact on performance (particularly when // precompiled headers are involved), we disable it. - CInvok->getLangOpts().SpellChecking = false; + CInvok->getLangOpts()->SpellChecking = false; if (!requestedToGetTU) CInvok->getPreprocessorOpts().DetailedRecord = false; |