From 722764b75a9f501e1e22509b0a3f611c28d41b22 Mon Sep 17 00:00:00 2001 From: Keith Randall Date: Mon, 21 Jul 2014 21:35:48 -0700 Subject: [PATCH] runtime: make go vet happy CL 117950044 updates vet to fix LEA* issue. LGTM=bradfitz R=golang-codereviews, bradfitz CC=golang-codereviews https://golang.org/cl/112440043 --- src/pkg/runtime/asm_amd64.s | 2 +- src/pkg/runtime/asm_amd64p32.s | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pkg/runtime/asm_amd64.s b/src/pkg/runtime/asm_amd64.s index 9f8a2514e3..80fc3b0d36 100644 --- a/src/pkg/runtime/asm_amd64.s +++ b/src/pkg/runtime/asm_amd64.s @@ -2276,7 +2276,7 @@ TEXT runtime·gohash(SB), NOSPLIT, $24-40 MOVQ size+16(FP), DX MOVQ seed+24(FP), DI MOVQ DI, ret+32(FP) - LEAQ ret+32(FP), SI // TODO: go vet complains here: "invalid LEAQ of ret+32(FP); bool is 1-byte value" + LEAQ ret+32(FP), SI MOVQ SI, 0(SP) MOVQ DX, 8(SP) MOVQ CX, 16(SP) diff --git a/src/pkg/runtime/asm_amd64p32.s b/src/pkg/runtime/asm_amd64p32.s index 097cacb607..6a3f033e8b 100644 --- a/src/pkg/runtime/asm_amd64p32.s +++ b/src/pkg/runtime/asm_amd64p32.s @@ -672,10 +672,10 @@ TEXT runtime·getcallerpc(SB),NOSPLIT,$0-8 MOVL -8(AX),AX // get calling pc RET -TEXT runtime·gogetcallerpc(SB),NOSPLIT,$0-8 +TEXT runtime·gogetcallerpc(SB),NOSPLIT,$0-12 MOVL p+0(FP),AX // addr of first arg MOVL -8(AX),AX // get calling pc - MOVL AX, ret+4(FP) + MOVL AX, ret+8(FP) RET TEXT runtime·setcallerpc(SB),NOSPLIT,$0-16 -- 2.48.1