]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: fix ARM assembly code in cgocallback
authorCherry Mui <cherryyz@google.com>
Fri, 24 Mar 2023 17:15:31 +0000 (13:15 -0400)
committerCherry Mui <cherryyz@google.com>
Fri, 24 Mar 2023 18:19:32 +0000 (18:19 +0000)
A comparison instruction was missing in CL 392854.

Should fix ARM builders.

For #51676.

Change-Id: Ica27a99be10e595bab4fad35e2e6c00a1c68a662
Reviewed-on: https://go-review.googlesource.com/c/go/+/479255
TryBot-Bypass: Cherry Mui <cherryyz@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>

src/runtime/asm_arm.s

index 88e518b0c4fa2a619e2b5e09747b2c1acc5e0d38..01906dff4a5eb723574e0947981264470a962b1c 100644 (file)
@@ -633,6 +633,7 @@ TEXT        Â·cgocallback(SB),NOSPLIT,$12-12
        // Skip cgocallbackg, just dropm when fn is nil, and frame is the saved g.
        // It is used to dropm while thread is exiting.
        MOVW    fn+0(FP), R1
+       CMP     $0, R1
        B.NE    loadg
        // Restore the g from frame.
        MOVW    frame+4(FP), g