Skip to content

Commit 1465c10

Browse files
alexmarkovCommit Queue
authored andcommitted
[vm,dyn_modules] Fix duplicate local symbols in ffi_trampolines_arm64.S
Duplicate symbols were used when both DART_DYNAMIC_MODULES and SIMULATOR_FFI are defined (on simarm64_arm64). TEST=ci Change-Id: I342a5c5a378efe9cee1268f60a29fdbff165016d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447562 Reviewed-by: Alexander Aprelev <[email protected]> Commit-Queue: Alexander Markov <[email protected]>
1 parent ecff5f0 commit 1465c10

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

runtime/vm/ffi_trampolines_arm64.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ FfiCallTrampoline:
3030
// Copy top frame from Dart stack to C stack
3131
ldr x0, [x19, #0] // FfiCallArguments.stack_area
3232
ldr x1, [x19, #8] // FfiCallArguments.stack_area_end
33-
.Lcopy:
33+
.Lcopy1:
3434
ldp x2, x3, [x1, #-16]! // From stack_area
3535
stp x2, x3, [sp, #-16]! // To C SP
3636
cmp x1, x0
37-
b.gt .Lcopy
37+
b.gt .Lcopy1
3838

3939
// Load the ABI argument registers. Note that Dart FFI does not support
4040
// full 128-bit SIMD arguments, so we don't need to set the full V
@@ -90,11 +90,11 @@ SimulatorFfiCalloutTrampoline:
9090
ldr x1, [x19, #24] // CalloutContext.simulator_frame_pointer
9191
add x1, x1, 15 // Round up the frame pointer, since the Dart frame pointer
9292
and x1, x1, ~15 // is not double-word aligned.
93-
.Lcopy:
93+
.Lcopy2:
9494
ldp x2, x3, [x1, #-16]! // From Dart FP
9595
stp x2, x3, [sp, #-16]! // To C SP
9696
cmp x1, x0
97-
b.gt .Lcopy
97+
b.gt .Lcopy2
9898

9999
// Load the ABI argument registers. Note that Dart FFI does not support
100100
// full 128-bit SIMD arguments, so we don't need to set the full V

0 commit comments

Comments
 (0)