mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

Bug 393930 - Unable to examine a sub-expression using "watch"

Browse source 
Change-Id: Ib8bde486546eef00440a8ef8f1ee05cfe7da48db
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/24299
Tested-by: Hudson CI
This commit is contained in:
Marc Khouzam 2014-04-16 14:17:59 -04:00
parent 12a2ba4b3f
commit 283f86d8d9
2 changed files with 92 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
View file

@ -2688,10 +2688,16 @@ public class MIVariableManager implements ICommandControl {
MIExpressionDMC miExprCtx = (MIExpressionDMC) exprCtx;
ExpressionInfo ctxExprInfo = miExprCtx.getExpressionInfo();
ExpressionInfo varExprInfo = varObj.getExpressionInfo();
// Don't use equals() below because we are concerned with other fields
// of ExpressionInfo that are not considered when doing equals().
// Instead, only consider equal if both objects are the same one
if (ctxExprInfo != varExprInfo) {
// exprCtrx could just be created via IExpressions.createExpression,
// and thus the parent-child relationship is not yet set.
miExprCtx.setExpressionInfo(varExprInfo);
// Set that relationship while keeping the relative expression of
// the original context (see bug 393930)
miExprCtx.setExpressionInfo(new ExpressionInfo(miExprCtx.getExpression(), miExprCtx.getRelativeExpression(),
varExprInfo.isDynamic(), varExprInfo.getParent(), varExprInfo.getIndexInParentExpression()));
}
rm.setData(varObj);

85
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java
View file

@ -43,6 +43,7 @@ import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext;
import org.eclipse.cdt.dsf.debug.service.IStack.IVariableDMData;
import org.eclipse.cdt.dsf.mi.service.ClassAccessor.MIExpressionDMCAccessor;
import org.eclipse.cdt.dsf.mi.service.MIExpressions;
import org.eclipse.cdt.dsf.mi.service.MIExpressions.MIExpressionDMC;
import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent;
import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
import org.eclipse.cdt.dsf.service.DsfServicesTracker;
@ -4178,6 +4179,90 @@ public class MIExpressionsTest extends BaseTestCase {
assertEquals("8", value);
}
/**
* This tests verifies that we can manually create a child of an expression
* after that child was automatically created through the parent.
* This case happens when selecting a child of an expression and using "Watch"
* to create an expression automatically.
*/
@Test
public void testExplicitChildCreation() throws Throwable {
SyncUtil.runToLocation("testExistingChild");
MIStoppedEvent stoppedEvent = SyncUtil.step(1, StepType.STEP_OVER);
IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
final String PARENT_EXPR = "b";
final String CHILD_EXPR = "((b).d)";
final String CHILD__REL_EXPR = "d";
// First fetch the child through its parent
final IExpressionDMContext parentDmc = SyncUtil.createExpression(frameDmc, PARENT_EXPR);
Query<String> query = new Query<String>() {
@Override
protected void execute(final DataRequestMonitor<String> rm) {
fExpService.getSubExpressions(
parentDmc,
new ImmediateDataRequestMonitor<IExpressionDMContext[]>(rm) {
@Override
protected void handleSuccess() {
if (getData().length != 2) {
rm.done(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Wrong number for children. Expecting 2 but got " + getData().length, null));
return;
}
MIExpressionDMC firstChildContext = (MIExpressionDMC)getData()[0];
if (firstChildContext.getExpression().equals(CHILD_EXPR) == false) {
rm.done(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Got wrong first child. Expected " + CHILD_EXPR + " but got " + firstChildContext.getExpression(), null));
return;
}
if (firstChildContext.getRelativeExpression().equals(CHILD__REL_EXPR) == false) {
rm.done(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Got wrong relative expression. Expected " + CHILD__REL_EXPR + " but got " + firstChildContext.getRelativeExpression(), null));
return;
}
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(firstChildContext, IFormattedValues.NATURAL_FORMAT),
new ImmediateDataRequestMonitor<FormattedValueDMData>(rm) {
@Override
protected void handleSuccess() {
rm.done(getData().getFormattedValue());
}
});
}
});
}
};
fSession.getExecutor().execute(query);
String value = query.get(500, TimeUnit.MILLISECONDS);
assertEquals("8", value);
// Now access the child directly
final IExpressionDMContext childDmc = SyncUtil.createExpression(frameDmc, CHILD_EXPR);
query = new Query<String>() {
@Override
protected void execute(final DataRequestMonitor<String> rm) {
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(childDmc, IFormattedValues.NATURAL_FORMAT),
new ImmediateDataRequestMonitor<FormattedValueDMData>(rm) {
@Override
protected void handleSuccess() {
rm.done(getData().getFormattedValue());
}
});
}
};
fSession.getExecutor().execute(query);
value = query.get(500, TimeUnit.MILLISECONDS);
assertEquals("8", value);
}
protected int getChildrenCount(final IExpressionDMContext parentDmc, final int expectedCount) throws Throwable {
final AsyncCompletionWaitor wait = new AsyncCompletionWaitor();