Skip to content

Commit b7c630d

Browse files
mauri870gopherbot
authored andcommitted
runtime: fix tests when running with -msan
Currently go test -msan runtime always fails on loong64, arm64 and amd64. Changed the variable name to sz to match the function prototypes. For #64256 Change-Id: Ida71197307016520deb39293927850d47845140a GitHub-Last-Rev: 0ee1e3b GitHub-Pull-Request: #64572 Reviewed-on: https://go-review.googlesource.com/c/go/+/547696 Reviewed-by: Keith Randall <khr@google.com> Reviewed-by: Keith Randall <khr@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Knyszek <mknyszek@google.com> Auto-Submit: Keith Randall <khr@golang.org>
1 parent b702e04 commit b7c630d

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/runtime/msan_amd64.s

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
// Called from msanread.
2929
TEXT runtime·domsanread(SB), NOSPLIT, $0-16
3030
MOVQ addr+0(FP), RARG0
31-
MOVQ size+8(FP), RARG1
31+
MOVQ sz+8(FP), RARG1
3232
// void __msan_read_go(void *addr, uintptr_t sz);
3333
MOVQ $__msan_read_go(SB), AX
3434
JMP msancall<>(SB)
@@ -37,23 +37,23 @@ TEXT runtime·domsanread(SB), NOSPLIT, $0-16
3737
// Called from instrumented code.
3838
TEXT runtime·msanwrite(SB), NOSPLIT, $0-16
3939
MOVQ addr+0(FP), RARG0
40-
MOVQ size+8(FP), RARG1
40+
MOVQ sz+8(FP), RARG1
4141
// void __msan_write_go(void *addr, uintptr_t sz);
4242
MOVQ $__msan_write_go(SB), AX
4343
JMP msancall<>(SB)
4444

4545
// func runtime·msanmalloc(addr unsafe.Pointer, sz uintptr)
4646
TEXT runtime·msanmalloc(SB), NOSPLIT, $0-16
4747
MOVQ addr+0(FP), RARG0
48-
MOVQ size+8(FP), RARG1
48+
MOVQ sz+8(FP), RARG1
4949
// void __msan_malloc_go(void *addr, uintptr_t sz);
5050
MOVQ $__msan_malloc_go(SB), AX
5151
JMP msancall<>(SB)
5252

5353
// func runtime·msanfree(addr unsafe.Pointer, sz uintptr)
5454
TEXT runtime·msanfree(SB), NOSPLIT, $0-16
5555
MOVQ addr+0(FP), RARG0
56-
MOVQ size+8(FP), RARG1
56+
MOVQ sz+8(FP), RARG1
5757
// void __msan_free_go(void *addr, uintptr_t sz);
5858
MOVQ $__msan_free_go(SB), AX
5959
JMP msancall<>(SB)
@@ -62,7 +62,7 @@ TEXT runtime·msanfree(SB), NOSPLIT, $0-16
6262
TEXT runtime·msanmove(SB), NOSPLIT, $0-24
6363
MOVQ dst+0(FP), RARG0
6464
MOVQ src+8(FP), RARG1
65-
MOVQ size+16(FP), RARG2
65+
MOVQ sz+16(FP), RARG2
6666
// void __msan_memmove(void *dst, void *src, uintptr_t sz);
6767
MOVQ $__msan_memmove(SB), AX
6868
JMP msancall<>(SB)

src/runtime/msan_arm64.s

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Called from msanread.
1717
TEXT runtime·domsanread(SB), NOSPLIT, $0-16
1818
MOVD addr+0(FP), RARG0
19-
MOVD size+8(FP), RARG1
19+
MOVD sz+8(FP), RARG1
2020
// void __msan_read_go(void *addr, uintptr_t sz);
2121
MOVD $__msan_read_go(SB), FARG
2222
JMP msancall<>(SB)
@@ -25,23 +25,23 @@ TEXT runtime·domsanread(SB), NOSPLIT, $0-16
2525
// Called from instrumented code.
2626
TEXT runtime·msanwrite(SB), NOSPLIT, $0-16
2727
MOVD addr+0(FP), RARG0
28-
MOVD size+8(FP), RARG1
28+
MOVD sz+8(FP), RARG1
2929
// void __msan_write_go(void *addr, uintptr_t sz);
3030
MOVD $__msan_write_go(SB), FARG
3131
JMP msancall<>(SB)
3232

3333
// func runtime·msanmalloc(addr unsafe.Pointer, sz uintptr)
3434
TEXT runtime·msanmalloc(SB), NOSPLIT, $0-16
3535
MOVD addr+0(FP), RARG0
36-
MOVD size+8(FP), RARG1
36+
MOVD sz+8(FP), RARG1
3737
// void __msan_malloc_go(void *addr, uintptr_t sz);
3838
MOVD $__msan_malloc_go(SB), FARG
3939
JMP msancall<>(SB)
4040

4141
// func runtime·msanfree(addr unsafe.Pointer, sz uintptr)
4242
TEXT runtime·msanfree(SB), NOSPLIT, $0-16
4343
MOVD addr+0(FP), RARG0
44-
MOVD size+8(FP), RARG1
44+
MOVD sz+8(FP), RARG1
4545
// void __msan_free_go(void *addr, uintptr_t sz);
4646
MOVD $__msan_free_go(SB), FARG
4747
JMP msancall<>(SB)
@@ -50,7 +50,7 @@ TEXT runtime·msanfree(SB), NOSPLIT, $0-16
5050
TEXT runtime·msanmove(SB), NOSPLIT, $0-24
5151
MOVD dst+0(FP), RARG0
5252
MOVD src+8(FP), RARG1
53-
MOVD size+16(FP), RARG2
53+
MOVD sz+16(FP), RARG2
5454
// void __msan_memmove(void *dst, void *src, uintptr_t sz);
5555
MOVD $__msan_memmove(SB), FARG
5656
JMP msancall<>(SB)

src/runtime/msan_loong64.s

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Called from msanread.
1717
TEXT runtime·domsanread(SB), NOSPLIT, $0-16
1818
MOVV addr+0(FP), RARG0
19-
MOVV size+8(FP), RARG1
19+
MOVV sz+8(FP), RARG1
2020
// void __msan_read_go(void *addr, uintptr_t sz);
2121
MOVV $__msan_read_go(SB), FARG
2222
JMP msancall<>(SB)
@@ -25,23 +25,23 @@ TEXT runtime·domsanread(SB), NOSPLIT, $0-16
2525
// Called from instrumented code.
2626
TEXT runtime·msanwrite(SB), NOSPLIT, $0-16
2727
MOVV addr+0(FP), RARG0
28-
MOVV size+8(FP), RARG1
28+
MOVV sz+8(FP), RARG1
2929
// void __msan_write_go(void *addr, uintptr_t sz);
3030
MOVV $__msan_write_go(SB), FARG
3131
JMP msancall<>(SB)
3232

3333
// func runtime·msanmalloc(addr unsafe.Pointer, sz uintptr)
3434
TEXT runtime·msanmalloc(SB), NOSPLIT, $0-16
3535
MOVV addr+0(FP), RARG0
36-
MOVV size+8(FP), RARG1
36+
MOVV sz+8(FP), RARG1
3737
// void __msan_malloc_go(void *addr, uintptr_t sz);
3838
MOVV $__msan_malloc_go(SB), FARG
3939
JMP msancall<>(SB)
4040

4141
// func runtime·msanfree(addr unsafe.Pointer, sz uintptr)
4242
TEXT runtime·msanfree(SB), NOSPLIT, $0-16
4343
MOVV addr+0(FP), RARG0
44-
MOVV size+8(FP), RARG1
44+
MOVV sz+8(FP), RARG1
4545
// void __msan_free_go(void *addr, uintptr_t sz);
4646
MOVV $__msan_free_go(SB), FARG
4747
JMP msancall<>(SB)
@@ -50,7 +50,7 @@ TEXT runtime·msanfree(SB), NOSPLIT, $0-16
5050
TEXT runtime·msanmove(SB), NOSPLIT, $0-24
5151
MOVV dst+0(FP), RARG0
5252
MOVV src+8(FP), RARG1
53-
MOVV size+16(FP), RARG2
53+
MOVV sz+16(FP), RARG2
5454
// void __msan_memmove(void *dst, void *src, uintptr_t sz);
5555
MOVV $__msan_memmove(SB), FARG
5656
JMP msancall<>(SB)

0 commit comments

Comments
 (0)