From: Russ Cox <rsc@golang.org>
Date: Thu, 1 Aug 2013 22:51:55 +0000 (-0400)
Subject: runtime: fix traceback across morestack
X-Git-Tag: go1.2rc2~827
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=13507e0697b2749e49341c25b9c1f5414f88d26e;p=gostls13.git

runtime: fix traceback across morestack

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/12287043
---

diff --git a/src/pkg/runtime/asm_arm.s b/src/pkg/runtime/asm_arm.s
index 863d9a5064..bdd37215b3 100644
--- a/src/pkg/runtime/asm_arm.s
+++ b/src/pkg/runtime/asm_arm.s
@@ -204,6 +204,10 @@ TEXT runtime·morestack(SB),7,$-4-0
 	MOVW	(g_sched+gobuf_sp)(g), SP
 	BL	runtime·newstack(SB)
 
+	// Not reached, but make sure the return PC from the call to newstack
+	// is still in this function, and not the beginning of the next.
+	RET
+
 // Called from reflection library.  Mimics morestack,
 // reuses stack growth code to create a frame
 // with the desired args running the desired function.