mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

Improve the propagation of the point of instantiation in CompositeValue

Browse source 
Change-Id: Ie874513e0dd9f22b20d40756b895303bd89a8ad1
This commit is contained in:
Nathan Ridge 2017-01-31 20:50:29 -05:00
parent db59f80812
commit 759a5d9a8e
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/CompositeValue.java
View file

@ -109,7 +109,7 @@ public final class CompositeValue implements IValue {
* Creates a value representing an instance of the given array type initialized with * Creates a value representing an instance of the given array type initialized with
* the elements of the given initializer list. * the elements of the given initializer list.
*/ */
public static IValue create(EvalInitList initList, IArrayType type) { public static IValue create(EvalInitList initList, IArrayType type, IASTNode point) {
Number arraySize = type.getSize().numberValue(); Number arraySize = type.getSize().numberValue();
if (arraySize == null) { if (arraySize == null) {
// Array size is dependent. TODO: Handle this? // Array size is dependent. TODO: Handle this?
@ -123,8 +123,8 @@ public final class CompositeValue implements IValue {
ICPPEvaluation[] values = new ICPPEvaluation[arraySize.intValue()]; ICPPEvaluation[] values = new ICPPEvaluation[arraySize.intValue()];
for (int i = 0; i < initList.getClauses().length; i++) { for (int i = 0; i < initList.getClauses().length; i++) {
ICPPEvaluation eval = initList.getClauses()[i]; ICPPEvaluation eval = initList.getClauses()[i];
IValue value = getValue(elementType, eval); IValue value = getValue(elementType, eval, point);
values[i] = new EvalFixed(elementType, eval.getValueCategory(null), value); values[i] = new EvalFixed(elementType, eval.getValueCategory(point), value);
} }
return new CompositeValue(initList, values); return new CompositeValue(initList, values);
} }
@ -132,12 +132,12 @@ public final class CompositeValue implements IValue {
/** /**
* Gets the value of an evaluation, interpreted as a value of the given type. * Gets the value of an evaluation, interpreted as a value of the given type.
*/ */
private static IValue getValue(IType type, ICPPEvaluation eval) { private static IValue getValue(IType type, ICPPEvaluation eval, IASTNode point) {
IValue value; IValue value;
if (type instanceof IArrayType && eval instanceof EvalInitList) { if (type instanceof IArrayType && eval instanceof EvalInitList) {
value = CompositeValue.create((EvalInitList) eval, (IArrayType) type); value = CompositeValue.create((EvalInitList) eval, (IArrayType) type, point);
} else if (type instanceof ICompositeType && eval instanceof EvalInitList) { } else if (type instanceof ICompositeType && eval instanceof EvalInitList) {
value = CompositeValue.create((EvalInitList) eval, (ICompositeType) type); value = CompositeValue.create((EvalInitList) eval, (ICompositeType) type, point);
} else if (eval instanceof EvalInitList) { } else if (eval instanceof EvalInitList) {
value = IntegralValue.UNKNOWN; value = IntegralValue.UNKNOWN;
} else { } else {
@ -150,8 +150,13 @@ public final class CompositeValue implements IValue {
* Creates a value representing an instance of the given composite type initialized with * Creates a value representing an instance of the given composite type initialized with
* the elements of the given initializer list. * the elements of the given initializer list.
*/ */
public static IValue create(EvalInitList initList, ICompositeType type) { public static IValue create(EvalInitList initList, ICompositeType type, IASTNode point) {
IField[] fields = type.getFields(); IField[] fields;
if (type instanceof ICPPClassType) {
fields = ClassTypeHelper.getFields((ICPPClassType) type, point);
} else {
fields = type.getFields();
}
ICPPEvaluation[] values = new ICPPEvaluation[fields.length]; ICPPEvaluation[] values = new ICPPEvaluation[fields.length];
ICPPEvaluation[] clauses = initList.getClauses(); ICPPEvaluation[] clauses = initList.getClauses();
for (int i = 0; i < fields.length; i++) { for (int i = 0; i < fields.length; i++) {
@ -160,7 +165,7 @@ public final class CompositeValue implements IValue {
IField field = fields[i]; IField field = fields[i];
ICPPEvaluation eval = clauses[i]; ICPPEvaluation eval = clauses[i];
IType fieldType = field.getType(); IType fieldType = field.getType();
IValue value = getValue(fieldType, eval); IValue value = getValue(fieldType, eval, point);
values[i] = new EvalFixed(fieldType, eval.getValueCategory(null), value); values[i] = new EvalFixed(fieldType, eval.getValueCategory(null), value);
} }
return new CompositeValue(initList, values); return new CompositeValue(initList, values);

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/ExecDeclarator.java
View file

@ -109,7 +109,8 @@ public final class ExecDeclarator implements ICPPExecution {
return createPointerValue(record, context, computedInitializerEval); return createPointerValue(record, context, computedInitializerEval);
} else if (isArrayType(nestedType) && !isCStringType(nestedType)) { } else if (isArrayType(nestedType) && !isCStringType(nestedType)) {
if (computedInitializerEval instanceof EvalInitList) { if (computedInitializerEval instanceof EvalInitList) {
IValue value = CompositeValue.create((EvalInitList) computedInitializerEval, (IArrayType) (type)); IValue value = CompositeValue.create((EvalInitList) computedInitializerEval,
(IArrayType) (type), context.getPoint());
return new EvalFixed(type, computedInitializerEval.getValueCategory(context.getPoint()), value); return new EvalFixed(type, computedInitializerEval.getValueCategory(context.getPoint()), value);
} else { } else {
// TODO(sprigogin): Should something else be done here? // TODO(sprigogin): Should something else be done here?