Address PR feedback

Author: yln

lldb/test/API/macosx/mte/TestDarwinMTE.py

@@ -50,11 +50,11 @@ def test_memory_read_with_tags(self):
             patterns=[r"(.*\(tag: 0x[0-9a-f]\)\n){4}"],
         )
 
-    def _parse_pointer_tag(self):
-        return re.search(r"Logical tag: (0x[0-9a-f])", self.res.GetOutput()).group(1)
+    def _parse_pointer_tag(self, output):
+        return re.search(r"Logical tag: (0x[0-9a-f])", output).group(1)
 
-    def _parse_memory_tags(self, expected_tag_count):
-        tags = re.findall(r"\): (0x[0-9a-f])", self.res.GetOutput())
+    def _parse_memory_tags(self, output, expected_tag_count):
+        tags = re.findall(r"\): (0x[0-9a-f])", output)
         self.assertEqual(len(tags), expected_tag_count)
         return tags
 
@@ -77,18 +77,20 @@ def test_memory_tag_read(self):
             substrs=["Logical tag: 0x", "Allocation tags:", "(mismatch)"],
             patterns=[r"(\[.*\): 0x[0-9a-f].*\n){4}"],
         )
-        self.assertEqual(self.res.GetOutput().count("(mismatch)"), 2)
-        ptr_tag = self._parse_pointer_tag()
-        tags = self._parse_memory_tags(4)
+        output = self.res.GetOutput()
+        self.assertEqual(output.count("(mismatch)"), 2)
+        ptr_tag = self._parse_pointer_tag(output)
+        tags = self._parse_memory_tags(output, 4)
         self.assertEqual(tags[1], ptr_tag)
         self.assertEqual(tags[2], ptr_tag)
-        self.assertNotEqual(tags[0], ptr_tag)
-        self.assertNotEqual(tags[3], ptr_tag)
+        self.assertNotEqual(tags[0], ptr_tag)  # Memory that comes before/after
+        self.assertNotEqual(tags[3], ptr_tag)  # allocation has different tag.
 
         # Continue running until MTE fault
-        self.runCmd("process continue")
+        self.expect("process continue", substrs=["stop reason = EXC_ARM_MTE_TAG_FAULT"])
 
         self.runCmd("memory tag read ptr-1 ptr+33")
-        self.assertEqual(self.res.GetOutput().count("(mismatch)"), 4)
-        tags = self._parse_memory_tags(4)
+        output = self.res.GetOutput()
+        self.assertEqual(output.count("(mismatch)"), 4)
+        tags = self._parse_memory_tags(output, 4)
         self.assertTrue(all(t != ptr_tag for t in tags))

lldb/test/API/macosx/mte/main.c

@@ -5,21 +5,20 @@
 
 // Produce some names on the trace
 const size_t tag_granule = 16;
-uint8_t *my_malloc(void) { return malloc(2 * tag_granule); }
-uint8_t *allocate(void) { return my_malloc(); }
+static uint8_t *my_malloc(void) { return malloc(2 * tag_granule); }
+static uint8_t *allocate(void) { return my_malloc(); }
 
-void my_free(void *ptr) { free(ptr); }
-void deallocate(void *ptr) { my_free(ptr); }
+static void my_free(void *ptr) { free(ptr); }
+static void deallocate(void *ptr) { my_free(ptr); }
 
-void touch_memory(uint8_t *ptr) { ptr[7] = 1; } // invalid access
-void modify(uint8_t *ptr) { touch_memory(ptr); }
+static void touch_memory(uint8_t *ptr) { ptr[7] = 1; } // invalid access
+static void modify(uint8_t *ptr) { touch_memory(ptr); }
 
 int main() {
   uint8_t *ptr = allocate();
-  printf("ptr: %p\n", ptr);
 
-  strcpy((char *)ptr, "Hello");
-  strcpy((char *)ptr + 16, "World");
+  strncpy((char *)ptr, "Hello", 16);
+  strncpy((char *)ptr + 16, "World", 16);
 
   deallocate(ptr); // before free
 

lldb/tools/debugserver/source/MacOSX/MachTask.mm

@@ -213,15 +213,15 @@
 }
 
 //----------------------------------------------------------------------
-// MachTask::GetMemoryRegionInfo
+// MachTask::MemoryRegionInfo
 //----------------------------------------------------------------------
 int MachTask::GetMemoryRegionInfo(nub_addr_t addr, DNBRegionInfo *region_info) {
   task_t task = TaskPort();
   if (task == TASK_NULL)
     return -1;
 
   int ret = m_vm_memory.GetMemoryRegionInfo(task, addr, region_info);
-  DNBLogThreadedIf(LOG_MEMORY, "MachTask::GetMemoryRegionInfo ( addr = 0x%8.8llx "
+  DNBLogThreadedIf(LOG_MEMORY, "MachTask::MemoryRegionInfo ( addr = 0x%8.8llx "
                                ") => %i  (start = 0x%8.8llx, size = 0x%8.8llx, "
                                "permissions = %u)",
                    (uint64_t)addr, ret, (uint64_t)region_info->addr,