diff options
author | Keith Randall <khr@golang.org> | 2020-02-13 07:37:28 -0800 |
---|---|---|
committer | Keith Randall <khr@golang.org> | 2020-02-13 16:25:03 +0000 |
commit | e237df5b53eb91d7a8d7247e7996f5edee6515b7 (patch) | |
tree | abfa2857ca71c51ce2dd5aa0a15eea04d796c7cb | |
parent | 363bcd0068bcc64ec09ab3d09921f559ca6d8070 (diff) | |
download | go-e237df5b53eb91d7a8d7247e7996f5edee6515b7.tar.gz go-e237df5b53eb91d7a8d7247e7996f5edee6515b7.zip |
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 <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
-rw-r--r-- | src/runtime/asm_amd64.s | 2 |
1 files changed, 0 insertions, 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 |