From: Cherry Mui <cherryyz@google.com>
Date: Fri, 24 Mar 2023 17:15:31 +0000 (-0400)
Subject: runtime: fix ARM assembly code in cgocallback
X-Git-Tag: go1.21rc1~1158
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fba8566cda3a7ba8f32ed398466f1d95bb205594;p=gostls13.git

runtime: fix ARM assembly code in cgocallback

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>
---

diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s
index 88e518b0c4..01906dff4a 100644
--- a/src/runtime/asm_arm.s
+++ b/src/runtime/asm_arm.s
@@ -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