Skip to content

Conversation

felipepiovezan
Copy link
Contributor

One of those arguments should be called pointer to correlate it to the name of the function and to distinguish it from the address where it will be written.

One of those arguments should be called `pointer` to correlate it to the
name of the function and to distinguish it from the address where it
will be written.
@llvmbot
Copy link
Member

llvmbot commented Sep 8, 2025

@llvm/pr-subscribers-lldb

Author: Felipe de Azevedo Piovezan (felipepiovezan)

Changes

One of those arguments should be called pointer to correlate it to the name of the function and to distinguish it from the address where it will be written.


Full diff: https://github.com/llvm/llvm-project/pull/157566.diff

2 Files Affected:

  • (modified) lldb/include/lldb/Expression/IRMemoryMap.h (+1-1)
  • (modified) lldb/source/Expression/IRMemoryMap.cpp (+5-5)
diff --git a/lldb/include/lldb/Expression/IRMemoryMap.h b/lldb/include/lldb/Expression/IRMemoryMap.h
index 58b95c56c1c36..56f79444764e6 100644
--- a/lldb/include/lldb/Expression/IRMemoryMap.h
+++ b/lldb/include/lldb/Expression/IRMemoryMap.h
@@ -65,7 +65,7 @@ class IRMemoryMap {
                    size_t size, Status &error);
   void WriteScalarToMemory(lldb::addr_t process_address, Scalar &scalar,
                            size_t size, Status &error);
-  void WritePointerToMemory(lldb::addr_t process_address, lldb::addr_t address,
+  void WritePointerToMemory(lldb::addr_t process_address, lldb::addr_t pointer,
                             Status &error);
   void ReadMemory(uint8_t *bytes, lldb::addr_t process_address, size_t size,
                   Status &error);
diff --git a/lldb/source/Expression/IRMemoryMap.cpp b/lldb/source/Expression/IRMemoryMap.cpp
index 26e59b76a4dac..f978217fa8f2b 100644
--- a/lldb/source/Expression/IRMemoryMap.cpp
+++ b/lldb/source/Expression/IRMemoryMap.cpp
@@ -637,19 +637,19 @@ void IRMemoryMap::WriteScalarToMemory(lldb::addr_t process_address,
 }
 
 void IRMemoryMap::WritePointerToMemory(lldb::addr_t process_address,
-                                       lldb::addr_t address, Status &error) {
+                                       lldb::addr_t pointer, Status &error) {
   error.Clear();
 
-  /// Only ask the Process to fix the address if this address belongs to the
+  /// Only ask the Process to fix `pointer` if the address belongs to the
   /// process. An address belongs to the process if the Allocation policy is not
   /// eAllocationPolicyHostOnly.
-  auto it = FindAllocation(address, 1);
+  auto it = FindAllocation(pointer, 1);
   if (it == m_allocations.end() ||
       it->second.m_policy != AllocationPolicy::eAllocationPolicyHostOnly)
     if (auto process_sp = GetProcessWP().lock())
-      address = process_sp->FixAnyAddress(address);
+      pointer = process_sp->FixAnyAddress(pointer);
 
-  Scalar scalar(address);
+  Scalar scalar(pointer);
 
   WriteScalarToMemory(process_address, scalar, GetAddressByteSize(), error);
 }

Copy link
Collaborator

@DavidSpickett DavidSpickett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@felipepiovezan felipepiovezan merged commit d367c7d into llvm:main Sep 9, 2025
11 checks passed
felipepiovezan added a commit to felipepiovezan/llvm-project that referenced this pull request Sep 12, 2025
One of those arguments should be called `pointer` to correlate it to the
name of the function and to distinguish it from the address where it
will be written.

(cherry picked from commit d367c7d)
felipepiovezan added a commit to felipepiovezan/llvm-project that referenced this pull request Sep 24, 2025
One of those arguments should be called `pointer` to correlate it to the
name of the function and to distinguish it from the address where it
will be written.

(cherry picked from commit d367c7d)
(cherry picked from commit d695eb0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants