[vm/gardening] Fix pointer arithmetic for win arm64.

aam · Commit Queue · commit 715f756c8833 · 2025-04-22T11:03:50.000-07:00
Fixes #60480 TEST=ci Change-Id: Iba94e7dbeaebfdcca818feccacc2e5e192510c18 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423680 Reviewed-by: Ryan Macnak <rmacnak@google.com> Commit-Queue: Alexander Aprelev <aam@google.com>
diff --git a/runtime/vm/isolate_reload_test.cc b/runtime/vm/isolate_reload_test.cc
@@ -6327,11 +6327,11 @@ TEST_CASE(IsolateReload_RegressB179030011) {
   }
   uint8_t* kernel_buffer = static_cast<uint8_t*>(malloc(kernel_buffer_size));
   TestCaseBase::AddToKernelBuffers(kernel_buffer);
-  intptr_t pos = 0;
+  uint8_t* target_ptr = kernel_buffer;
   for (auto component : components) {
-    memcpy(kernel_buffer + pos, component.kernel_buffer,  // NOLINT
+    memcpy(target_ptr, component.kernel_buffer,  // NOLINT
            component.kernel_buffer_size);
-    pos += component.kernel_buffer_size;
+    target_ptr += component.kernel_buffer_size;
   }
 
   // Load the first component into the isolate (to have something set as

Original file line number	Diff line number	Diff line change
`@@ -6327,11 +6327,11 @@ TEST_CASE(IsolateReload_RegressB179030011) {`
`6327`	`6327`	`}`
`6328`	`6328`	`uint8_t* kernel_buffer = static_cast<uint8_t*>(malloc(kernel_buffer_size));`
`6329`	`6329`	`TestCaseBase::AddToKernelBuffers(kernel_buffer);`
`6330`		`- intptr_t pos = 0;`
	`6330`	`+ uint8_t* target_ptr = kernel_buffer;`
`6331`	`6331`	`for (auto component : components) {`
`6332`		`- memcpy(kernel_buffer + pos, component.kernel_buffer, // NOLINT`
	`6332`	`+ memcpy(target_ptr, component.kernel_buffer, // NOLINT`
`6333`	`6333`	`component.kernel_buffer_size);`
`6334`		`- pos += component.kernel_buffer_size;`
	`6334`	`+ target_ptr += component.kernel_buffer_size;`
`6335`	`6335`	`}`
`6336`	`6336`
`6337`	`6337`	`// Load the first component into the isolate (to have something set as`