From e237df5b53eb91d7a8d7247e7996f5edee6515b7 Mon Sep 17 00:00:00 2001 From: Keith Randall Date: Thu, 13 Feb 2020 07:37:28 -0800 Subject: [PATCH] runtime: fix fallback logic for aeshash on 32/64 bit We were using the fallback hash unconditionally. Oops. Fixes #37212 Change-Id: Id37d4f5c08806fdda12a3148ba4dbc46676eeb54 Reviewed-on: https://go-review.googlesource.com/c/go/+/219337 Run-TryBot: Keith Randall TryBot-Result: Gobot Gobot Reviewed-by: Cherry Zhang --- src/runtime/asm_amd64.s | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/runtime/asm_amd64.s b/src/runtime/asm_amd64.s index ba673432c1..c191599c28 100644 --- a/src/runtime/asm_amd64.s +++ b/src/runtime/asm_amd64.s @@ -1244,7 +1244,6 @@ aesloop: TEXT runtime·memhash32(SB),NOSPLIT,$0-24 CMPB runtime·useAeshash(SB), $0 JEQ noaes - JMP runtime·memhash32Fallback(SB) MOVQ p+0(FP), AX // ptr to data MOVQ h+8(FP), X0 // seed PINSRD $2, (AX), X0 // data @@ -1260,7 +1259,6 @@ noaes: TEXT runtime·memhash64(SB),NOSPLIT,$0-24 CMPB runtime·useAeshash(SB), $0 JEQ noaes - JMP runtime·memhash64Fallback(SB) MOVQ p+0(FP), AX // ptr to data MOVQ h+8(FP), X0 // seed PINSRQ $1, (AX), X0 // data -- 2.48.1