Find the # that was preventing the extension from being included! Switch over to type byte size

Author: Jlalond

lldb/bindings/interface/SBSaveCoreOptionsExtensions.i

@@ -1,27 +1,27 @@
 
 %extend lldb::SBSaveCoreOptions {
 #ifdef SWIGPYTHON
-    %pythoncode %{
+    %pythoncode%{
         def save_thread_with_heaps(self, thread, num_pointers_deep = 3):
             self.AddThread(thread)
             frame = thread.GetFrameAtIndex(0)
             process = thread.GetProcess()
             queue = []
             for var in frame.locals:
-                if var.TypeIsPointerType():
+                type = var.GetType()
+                if type.IsPointerType() or type.IsReferenceType():
                     queue.append(var.Dereference())
 
             while (num_pointers_deep > 0 and len(queue) > 0):
                 queue_size = len(queue)
                 for i in range(0, queue_size):
                     var = queue.pop(0)
-                    memory_region = lldb.SBMemoryRegionInfo()
-                    process.GetMemoryRegionInfo(var.GetAddress().GetOffset(), memory_region)
+                    var_type = var.GetType()
+                    addr = var.GetAddress().GetOffset()
+                    memory_region = lldb.SBMemoryRegionInfo(None, addr, addr + var_type.GetByteSize(), False)
                     self.AddMemoryRegionToSave(memory_region)
-                    /* 
-                    We only check for direct pointer children T*, should probably scan 
-                    internal to the children themselves. 
-                    */
+                    # We only check for direct pointer children T*, should probably scan 
+                    # internal to the children themselves. 
                     for x in var.children:
                         if x.TypeIsPointerType():
                             queue.append(x.Dereference())

lldb/bindings/interfaces.swig

@@ -200,7 +200,7 @@
 %include "./interface/SBProcessExtensions.i"
 %include "./interface/SBProcessInfoListExtensions.i"
 %include "./interface/SBQueueItemExtensions.i"
-#include "./interface/SBSaveCoreOptionsExtensions.i"
+%include "./interface/SBSaveCoreOptionsExtensions.i"
 %include "./interface/SBScriptObjectExtensions.i"
 %include "./interface/SBSectionExtensions.i"
 %include "./interface/SBStreamExtensions.i"

lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py

@@ -489,7 +489,7 @@ def test_save_core_one_thread_one_heap(self):
             options.SetPluginName("minidump")
             options.SetStyle(lldb.eSaveCoreCustomOnly)
             thread = process.GetThreadAtIndex(0)
-            options.save_thread_with_heaps(thread)
+            options.save_thread_with_heaps(thread, 1)
 
             error = process.SaveCore(options)
             self.assertTrue(error.Success())
@@ -498,6 +498,24 @@ def test_save_core_one_thread_one_heap(self):
             # proc/pid maps prevent us from checking the number of regions, but
             # this is mostly a smoke test for the extension.
             self.assertEqual(core_proc.GetNumThreads(), 1)
+            addr = (
+                process.GetThreadAtIndex(0)
+                .GetFrameAtIndex(0)
+                .FindVariable("str")
+                .Dereference()
+                .GetAddress()
+                .GetOffset()
+            )
+            core_addr = (
+                core_proc.GetThreadAtIndex(0)
+                .GetFrameAtIndex(0)
+                .FindVariable("str")
+                .Dereference()
+                .GetAddress()
+                .GetOffset()
+            )
+            self.assertEqual(addr, core_addr)
+
         finally:
             if os.path.isfile(custom_file):
                 os.unlink(custom_file)

lldb/test/API/functionalities/process_save_core_minidump/main.cpp

@@ -18,7 +18,7 @@ size_t h() {
 
 int main() {
   std::thread t1(f);
-
+  char *str = new char[10];
   size_t x = h();
 
   t1.join();