mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Bug 339634 - [performance] Quick fix create local variable and others can be slow

Browse source
This commit is contained in:
Marc-Andre Laperle 2011-03-11 05:15:53 +00:00
parent dfb6654676
commit 5ef3de90b4
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2009, 2010 Alena Laskavaia, Tomasz Wesolowski * Copyright (c) 2009, 2011 Alena Laskavaia, Tomasz Wesolowski
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,6 +12,7 @@
package org.eclipse.cdt.codan.core.cxx; package org.eclipse.cdt.codan.core.cxx;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@ -36,6 +37,7 @@ import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTStatement;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
import org.eclipse.cdt.core.dom.ast.IBasicType.Kind; import org.eclipse.cdt.core.dom.ast.IBasicType.Kind;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
@ -238,11 +240,19 @@ public final class CxxAstUtils {
} }
} }
} }
HashMap<ITranslationUnit, IASTTranslationUnit> astCache = new HashMap<ITranslationUnit, IASTTranslationUnit>();
for (IIndexName decl : declSet) { for (IIndexName decl : declSet) {
// for now, just use the first overload found // for now, just use the first overload found
ITranslationUnit tu = getTranslationUnitFromIndexName(decl); ITranslationUnit tu = getTranslationUnitFromIndexName(decl);
IASTName name = (IASTName) tu.getAST(null, ITranslationUnit.AST_SKIP_INDEXED_HEADERS).getNodeSelector(null) IASTTranslationUnit ast = null;
.findEnclosingNode(decl.getNodeOffset(), decl.getNodeLength()); if(astCache.containsKey(tu)) {
ast = astCache.get(tu);
} else {
ast = tu.getAST(index, ITranslationUnit.AST_SKIP_INDEXED_HEADERS);
astCache.put(tu, ast);
}
IASTName name = (IASTName) ast.getNodeSelector(null).findEnclosingNode(decl.getNodeOffset(), decl.getNodeLength());
IASTNode fdecl = name; IASTNode fdecl = name;
while (fdecl instanceof IASTName) { while (fdecl instanceof IASTName) {
fdecl = fdecl.getParent(); fdecl = fdecl.getParent();
@ -304,6 +314,7 @@ public final class CxxAstUtils {
public IASTCompositeTypeSpecifier getCompositeTypeFromFunction(final IASTFunctionDefinition function, final IIndex index) { public IASTCompositeTypeSpecifier getCompositeTypeFromFunction(final IASTFunctionDefinition function, final IIndex index) {
// return value to be set via visitor // return value to be set via visitor
final IASTCompositeTypeSpecifier returnSpecifier[] = { null }; final IASTCompositeTypeSpecifier returnSpecifier[] = { null };
final HashMap<ITranslationUnit, IASTTranslationUnit> astCache = new HashMap<ITranslationUnit, IASTTranslationUnit>();
function.accept(new ASTVisitor() { function.accept(new ASTVisitor() {
{ {
shouldVisitDeclarators = true; shouldVisitDeclarators = true;
@ -329,8 +340,14 @@ public final class CxxAstUtils {
// Check the declarations and use first suitable // Check the declarations and use first suitable
for (IIndexName decl : declarations) { for (IIndexName decl : declarations) {
ITranslationUnit tu = getTranslationUnitFromIndexName(decl); ITranslationUnit tu = getTranslationUnitFromIndexName(decl);
IASTNode node = tu.getAST(index, ITranslationUnit.AST_SKIP_INDEXED_HEADERS).getNodeSelector(null) IASTTranslationUnit ast = null;
.findEnclosingNode(decl.getNodeOffset(), decl.getNodeLength()); if(astCache.containsKey(tu)) {
ast = astCache.get(tu);
} else {
ast = tu.getAST(index, ITranslationUnit.AST_SKIP_INDEXED_HEADERS);
astCache.put(tu, ast);
}
IASTNode node = ast.getNodeSelector(null).findEnclosingNode(decl.getNodeOffset(), decl.getNodeLength());
IASTCompositeTypeSpecifier specifier = getEnclosingCompositeTypeSpecifier(node); IASTCompositeTypeSpecifier specifier = getEnclosingCompositeTypeSpecifier(node);
if (specifier != null) { if (specifier != null) {
returnSpecifier[0] = specifier; returnSpecifier[0] = specifier;