From b1f8fb166007b26907c1669238364a70b500c2cf Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 5 Mar 2025 09:58:03 +0100
Subject: [PATCH] Debugger: Fix memory stack layout

This piece of code vanished during the big refactoring.

Fixes: QTCREATORBUG-32542
Change-Id: I8fae3f3a8e0ab2e4951f52d1377987f8ad01e358
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/debugger/cdbbridge.py  | 2 +-
 share/qtcreator/debugger/dumper.py     | 2 ++
 share/qtcreator/debugger/gdbbridge.py  | 1 +
 share/qtcreator/debugger/lldbbridge.py | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py
index afb757ff421..c3ca2287b0a 100644
--- a/share/qtcreator/debugger/cdbbridge.py
+++ b/share/qtcreator/debugger/cdbbridge.py
@@ -130,7 +130,7 @@ class Dumper(DumperBase):
         val.typeid = self.from_native_type(nativeValue.type())
         val.nativeValue = nativeValue
         val.laddress = nativeValue.address()
-        val.lbitsize = nativeValue.bitsize()
+        val.size = nativeValue.bitsize()
         return val
 
     def nativeTypeId(self, nativeType: cdbext.Type) -> str:
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 8ef403e829d..73ef602e9d8 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -3004,6 +3004,8 @@ typename))
             return
 
         self.putAddress(value.address())
+        if value.size is not None:
+            self.putField('size', value.size // 8)
 
         if typecode == TypeCode.Function:
             #self.warn('FUNCTION VALUE: %s' % value)
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
index 8cbb1ba6e3a..5b2de6e5fce 100644
--- a/share/qtcreator/debugger/gdbbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
@@ -276,6 +276,7 @@ class Dumper(DumperBase):
                 val.typeid = typeid
         #elif code == gdb.TYPE_CODE_ARRAY:
         #    val.type.ltarget = nativeValue[0].type.unqualified()
+        val.size = nativeType.sizeof * 8
         return val
 
     def nativeDataFromValueFallback(self, nativeValue, size):
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index c90c1327c48..2d15bae92ab 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -207,6 +207,7 @@ class Dumper(DumperBase):
         val.summary = summary
         val.lIsInScope = nativeValue.IsInScope()
         val.name = nativeValue.GetName()
+        val.size = nativeType.GetByteSize() * 8
         return val
 
     def nativeListMembers(self, value, nativeType, include_base):