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 /lib/Frontend/CompilerInstance.cpp | |
| parent | d04a982d3472d98e58f58dfc327ca11e236980f5 (diff) | |
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 'lib/Frontend/CompilerInstance.cpp')
| -rw-r--r-- | lib/Frontend/CompilerInstance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index ea2c3bd6c6..838a0675f2 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -987,11 +987,11 @@ static void compileModule(CompilerInstance &ImportingInstance, // For any options that aren't intended to affect how a module is built, // reset them to their default values. - Invocation->getLangOpts().resetNonModularOptions(); + Invocation->getLangOpts()->resetNonModularOptions(); Invocation->getPreprocessorOpts().resetNonModularOptions(); // Note the name of the module we're building. - Invocation->getLangOpts().CurrentModule = ModuleName; + Invocation->getLangOpts()->CurrentModule = ModuleName; // Note that this module is part of the module build path, so that we // can detect cycles in the module graph. @@ -1004,7 +1004,7 @@ static void compileModule(CompilerInstance &ImportingInstance, FrontendOpts.DisableFree = false; FrontendOpts.Inputs.clear(); FrontendOpts.Inputs.push_back( - std::make_pair(getSourceInputKindFromOptions(Invocation->getLangOpts()), + std::make_pair(getSourceInputKindFromOptions(*Invocation->getLangOpts()), UmbrellaHeader)); Invocation->getDiagnosticOpts().VerifyDiagnostics = 0; |