checking if clients support memory events

Author: omarArm

src/gdb/GDBDebugSessionBase.ts

@@ -159,6 +159,7 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
 
     protected supportsRunInTerminalRequest = false;
     protected supportsMemoryReferences = false;
+    protected supportsMemoryEvent = false;
     public supportsGdbConsole = false;
 
     /* A reference to the logger to be used by subclasses */
@@ -421,6 +422,7 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
     ): void {
         this.supportsRunInTerminalRequest =
             args.supportsRunInTerminalRequest === true;
+        this.supportsMemoryEvent = args.supportsMemoryEvent === true;
         this.supportsMemoryReferences = args.supportsMemoryReferences === true;
         this.supportsGdbConsole =
             os.platform() === 'linux' && this.supportsRunInTerminalRequest;
@@ -2669,44 +2671,6 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
                             })
                         ).value
                       : varobj.value;
-                if (this.supportsMemoryReferences) {
-                    let memoryReferenceResult:
-                        | MIGDBDataEvaluateExpressionResponse
-                        | undefined;
-                    let hasMemoryReference = false;
-                    try {
-                        memoryReferenceResult =
-                            await mi.sendDataEvaluateExpression(
-                                gdb,
-                                `&(${varobj.expression})`
-                            );
-                        // Depending on the GDBServer being used, sometimes the result of evaluating an address of a symbol returns "<address> <symbol name>"
-                        if (memoryReferenceResult.value?.includes(' ')) {
-                            memoryReferenceResult.value =
-                                memoryReferenceResult.value.split(' ')[0];
-                        }
-                        hasMemoryReference = true;
-                    } catch (err) {
-                        hasMemoryReference = false;
-                    }
-                    const variablesReference =
-                        parseInt(varobj.numchild, 10) > 0
-                            ? this.variableHandles.create({
-                                  type: 'object',
-                                  frameHandle,
-                                  varobjName: varobj.varname,
-                              })
-                            : 0;
-                    response.body = {
-                        result,
-                        type: varobj.type,
-                        variablesReference,
-                        memoryReference:
-                            hasMemoryReference && memoryReferenceResult
-                                ? memoryReferenceResult.value
-                                : undefined,
-                    };
-                }
                 const variablesReference =
                     parseInt(varobj.numchild, 10) > 0
                         ? this.variableHandles.create({
@@ -3352,6 +3316,9 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
                 this.handleCmdParamChanged(notifyData);
                 break;
             case 'memory-changed': {
+                if (!this.supportsMemoryEvent) {
+                    break;
+                }
                 let length = 0;
                 if (isNaN(notifyData.len)) {
                     logger.warn(

src/integration-tests/evaluate.spec.ts

@@ -531,26 +531,6 @@ describe('evaluate request global variables', function () {
         });
         expect(evalRes.body.result).to.equal('25');
     });
-
-    it('response for variables should include memory reference if the expression has an lvalue', async function () {
-        // Read a global variable using evaluateRequest
-        const watchRes = await dc.evaluateRequest({
-            context: 'watch',
-            expression: 'global_int',
-            frameId: scope.frame.id,
-        });
-        expect(watchRes.body.memoryReference).to.be.a('string');
-    });
-
-    it('response for variables should include memory reference if the expression does not have an lvalue', async function () {
-        const watchRes = await dc.evaluateRequest({
-            context: 'watch',
-            expression: 'global_int + 1',
-            frameId: scope.frame.id,
-        });
-
-        expect(watchRes.body.memoryReference).to.be.undefined;
-    });
 });
 
 describe('evaluate request - watch local variable across lexical scope transition', function () {