Skip to content

Commit

Permalink
runtime: fix tests when running with -msan
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@mauri870 @gopherbot
mauri870 authored and gopherbot committed Jan 9, 2024
1 parent b702e04 commit b7c630d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions src/runtime/msan_amd64.s
View file
Expand Up @@ -28,7 +28,7 @@
// Called from msanread.
TEXT runtime·domsanread(SB), NOSPLIT, $0-16
MOVQ addr+0(FP), RARG0
MOVQ size+8(FP), RARG1
MOVQ sz+8(FP), RARG1
// void __msan_read_go(void *addr, uintptr_t sz);
MOVQ $__msan_read_go(SB), AX
JMP msancall<>(SB)
Expand All @@ -37,23 +37,23 @@ TEXT runtime·domsanread(SB), NOSPLIT, $0-16
// Called from instrumented code.
TEXT runtime·msanwrite(SB), NOSPLIT, $0-16
MOVQ addr+0(FP), RARG0
MOVQ size+8(FP), RARG1
MOVQ sz+8(FP), RARG1
// void __msan_write_go(void *addr, uintptr_t sz);
MOVQ $__msan_write_go(SB), AX
JMP msancall<>(SB)

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

// func runtime·msanfree(addr unsafe.Pointer, sz uintptr)
TEXT runtime·msanfree(SB), NOSPLIT, $0-16
MOVQ addr+0(FP), RARG0
MOVQ size+8(FP), RARG1
MOVQ sz+8(FP), RARG1
// void __msan_free_go(void *addr, uintptr_t sz);
MOVQ $__msan_free_go(SB), AX
JMP msancall<>(SB)
Expand All @@ -62,7 +62,7 @@ TEXT runtime·msanfree(SB), NOSPLIT, $0-16
TEXT runtime·msanmove(SB), NOSPLIT, $0-24
MOVQ dst+0(FP), RARG0
MOVQ src+8(FP), RARG1
MOVQ size+16(FP), RARG2
MOVQ sz+16(FP), RARG2
// void __msan_memmove(void *dst, void *src, uintptr_t sz);
MOVQ $__msan_memmove(SB), AX
JMP msancall<>(SB)
Expand Down
10 changes: 5 additions & 5 deletions src/runtime/msan_arm64.s
View file
Expand Up @@ -16,7 +16,7 @@
// Called from msanread.
TEXT runtime·domsanread(SB), NOSPLIT, $0-16
MOVD addr+0(FP), RARG0
MOVD size+8(FP), RARG1
MOVD sz+8(FP), RARG1
// void __msan_read_go(void *addr, uintptr_t sz);
MOVD $__msan_read_go(SB), FARG
JMP msancall<>(SB)
Expand All @@ -25,23 +25,23 @@ TEXT runtime·domsanread(SB), NOSPLIT, $0-16
// Called from instrumented code.
TEXT runtime·msanwrite(SB), NOSPLIT, $0-16
MOVD addr+0(FP), RARG0
MOVD size+8(FP), RARG1
MOVD sz+8(FP), RARG1
// void __msan_write_go(void *addr, uintptr_t sz);
MOVD $__msan_write_go(SB), FARG
JMP msancall<>(SB)

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

// func runtime·msanfree(addr unsafe.Pointer, sz uintptr)
TEXT runtime·msanfree(SB), NOSPLIT, $0-16
MOVD addr+0(FP), RARG0
MOVD size+8(FP), RARG1
MOVD sz+8(FP), RARG1
// void __msan_free_go(void *addr, uintptr_t sz);
MOVD $__msan_free_go(SB), FARG
JMP msancall<>(SB)
Expand All @@ -50,7 +50,7 @@ TEXT runtime·msanfree(SB), NOSPLIT, $0-16
TEXT runtime·msanmove(SB), NOSPLIT, $0-24
MOVD dst+0(FP), RARG0
MOVD src+8(FP), RARG1
MOVD size+16(FP), RARG2
MOVD sz+16(FP), RARG2
// void __msan_memmove(void *dst, void *src, uintptr_t sz);
MOVD $__msan_memmove(SB), FARG
JMP msancall<>(SB)
Expand Down
10 changes: 5 additions & 5 deletions src/runtime/msan_loong64.s
View file
Expand Up @@ -16,7 +16,7 @@
// Called from msanread.
TEXT runtime·domsanread(SB), NOSPLIT, $0-16
MOVV addr+0(FP), RARG0
MOVV size+8(FP), RARG1
MOVV sz+8(FP), RARG1
// void __msan_read_go(void *addr, uintptr_t sz);
MOVV $__msan_read_go(SB), FARG
JMP msancall<>(SB)
Expand All @@ -25,23 +25,23 @@ TEXT runtime·domsanread(SB), NOSPLIT, $0-16
// Called from instrumented code.
TEXT runtime·msanwrite(SB), NOSPLIT, $0-16
MOVV addr+0(FP), RARG0
MOVV size+8(FP), RARG1
MOVV sz+8(FP), RARG1
// void __msan_write_go(void *addr, uintptr_t sz);
MOVV $__msan_write_go(SB), FARG
JMP msancall<>(SB)

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

// func runtime·msanfree(addr unsafe.Pointer, sz uintptr)
TEXT runtime·msanfree(SB), NOSPLIT, $0-16
MOVV addr+0(FP), RARG0
MOVV size+8(FP), RARG1
MOVV sz+8(FP), RARG1
// void __msan_free_go(void *addr, uintptr_t sz);
MOVV $__msan_free_go(SB), FARG
JMP msancall<>(SB)
Expand All @@ -50,7 +50,7 @@ TEXT runtime·msanfree(SB), NOSPLIT, $0-16
TEXT runtime·msanmove(SB), NOSPLIT, $0-24
MOVV dst+0(FP), RARG0
MOVV src+8(FP), RARG1
MOVV size+16(FP), RARG2
MOVV sz+16(FP), RARG2
// void __msan_memmove(void *dst, void *src, uintptr_t sz);
MOVV $__msan_memmove(SB), FARG
JMP msancall<>(SB)
Expand Down

0 comments on commit b7c630d

Please sign in to comment.