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

Avoid EvalFunctionCall storing the evaluation for the implicit 'this' twice

Browse source 
In cases where the function argument was an EvalMemberAccess with an
ownerEval storing the evaluation for the implicit 'this', the field
EvalFunctionCall.fImplicitThis was duplicating this storage, leading
to exponential space usage in chained method calls.

Change-Id: I56e775143b47a3a7f986c2d86312f122c2d4bcff
This commit is contained in:
Nathan Ridge 2016-12-12 23:10:56 -05:00
parent 3f3b8b2ee7
commit 659ff8c4a7
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java
View file

@ -59,7 +59,7 @@ public final class EvalFunctionCall extends CPPDependentEvaluation {
public EvalFunctionCall(ICPPEvaluation[] args, ICPPEvaluation owner, IBinding templateDefinition) {
super(templateDefinition);
fArguments = args;
fImplicitThis = owner;
fImplicitThis = getImplicitThis() == owner ? null : owner;
}
public EvalFunctionCall(ICPPEvaluation[] args, ICPPEvaluation owner, IASTNode pointOfDefinition) {
@ -73,6 +73,19 @@ public final class EvalFunctionCall extends CPPDependentEvaluation {
public ICPPEvaluation[] getArguments() {
return fArguments;
}
private ICPPEvaluation getImplicitThis() {
if (fImplicitThis != null)
return fImplicitThis;
if (fArguments.length > 0) {
if (fArguments[0] instanceof EvalMemberAccess) {
return ((EvalMemberAccess) fArguments[0]).getOwnerEval();
}
}
return null;
}
@Override
public boolean isInitializerList() {
@ -245,17 +258,18 @@ public final class EvalFunctionCall extends CPPDependentEvaluation {
args[i] = arg;
}
ICPPEvaluation implicitThis = getImplicitThis();
ICPPEvaluation owner = null;
if (functionBinding instanceof ICPPMethod) {
if (fImplicitThis instanceof EvalBinding) {
IBinding ownerBinding = ((EvalBinding) fImplicitThis).getBinding();
if (implicitThis instanceof EvalBinding) {
IBinding ownerBinding = ((EvalBinding) implicitThis).getBinding();
if (record.getVariable(ownerBinding) != null) {
owner = new EvalReference(record, ownerBinding, fImplicitThis.getTemplateDefinition());
owner = new EvalReference(record, ownerBinding, implicitThis.getTemplateDefinition());
} else {
owner = fImplicitThis;
owner = implicitThis;
}
} else if (fImplicitThis != null) {
owner = fImplicitThis.computeForFunctionCall(record, context);
} else if (implicitThis != null) {
owner = implicitThis.computeForFunctionCall(record, context);
} else {
owner = record.getImplicitThis();
}
@ -281,7 +295,8 @@ public final class EvalFunctionCall extends CPPDependentEvaluation {
if (!function.isConstexpr())
return EvalFixed.INCOMPLETE;
ActivationRecord record = createActivationRecord(function.getParameters(), fArguments, fImplicitThis, context.getPoint());
ActivationRecord record = createActivationRecord(function.getParameters(), fArguments,
getImplicitThis(), context.getPoint());
ICPPExecution bodyExec = CPPFunction.getFunctionBodyExecution(function, context.getPoint());
if (bodyExec == null) {
if (!(function instanceof ICPPTemplateInstance)