From cc23d88b5486ace4e73cde115ad551329a2d3ec4 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Fri, 4 May 2018 00:48:38 -0400 Subject: [PATCH] Bug 534330 - Only create an index for the project containing the TU being analyzed in CxxModelsCache.getIndex() Change-Id: I3391e1201b51ab32c35c73cfb2f861614da07057 --- .../org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java index 252ff638e37..68aec4c655d 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java @@ -21,8 +21,6 @@ import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.ASTCommenter; import org.eclipse.core.resources.IFile; @@ -120,8 +118,7 @@ public class CxxModelsCache implements ICodanDisposable { public synchronized IIndex getIndex() throws CoreException, OperationCanceledException { Assert.isTrue(!disposed, "CxxASTCache is already disposed."); //$NON-NLS-1$ if (this.index == null) { - ICProject[] projects = CoreModel.getDefault().getCModel().getCProjects(); - IIndex index = CCorePlugin.getIndexManager().getIndex(projects); + IIndex index = CCorePlugin.getIndexManager().getIndex(tu.getCProject()); try { index.acquireReadLock(); } catch (InterruptedException e) {