[308540] - [expressions][update policy][cdi] Disabled expressions are still evaluated

1 files changed, 6 insertions, 1 deletions

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbExpressionVMProvider.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbExpressionVMProvider.java
index 89de45a24ce..55a4b2bc643 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbExpressionVMProvider.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbExpressionVMProvider.java
@@ -11,6 +11,7 @@
 package org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel;
 
 import org.eclipse.cdt.dsf.debug.ui.IDsfDebugUIConstants;
+import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.DisabledExpressionVMNode;
 import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionManagerVMNode;
 import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider;
 import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode;
@@ -72,6 +73,10 @@ public class GdbExpressionVMProvider extends ExpressionVMProvider {
             addChildNodes(rootNode, new IVMNode[] {expressionManagerNode});
         }
         
+        // Disabled expression node intercepts disabled expressions and prevents them from being
+        // evaluated by other nodes.
+        IExpressionVMNode disabledExpressionNode = new DisabledExpressionVMNode(this);
+
         /*
          *  The expression view wants to support fully all of the components of the register view.
          */
@@ -105,7 +110,7 @@ public class GdbExpressionVMProvider extends ExpressionVMProvider {
          *  assume what it was passed was for it and the real node which wants to handle it would be
          *  left out in the cold.
          */
-        setExpressionNodes(new IExpressionVMNode[] {registerGroupNode, variableNode});
+        setExpressionNodes(new IExpressionVMNode[] {disabledExpressionNode, registerGroupNode, variableNode});
         
         /*
          *  Let the work know which is the top level node.