From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 15 Aug 2014 22:16:55 +0000 (+0000)
Subject: runtime: Don't get confused if m changes during runtime_gc.
X-Git-Tag: releases/gcc-5.1.0~5446
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab36d98dd2803009eb49393d72f19041d53adffd;p=thirdparty%2Fgcc.git

runtime: Don't get confused if m changes during runtime_gc.

From-SVN: r214048
---

diff --git a/libgo/runtime/mgc0.c b/libgo/runtime/mgc0.c
index 4b78f3bda56a..2d6328fbac3b 100644
--- a/libgo/runtime/mgc0.c
+++ b/libgo/runtime/mgc0.c
@@ -2204,6 +2204,7 @@ runtime_gc(int32 force)
 		g->status = Gwaiting;
 		g->waitreason = "garbage collection";
 		runtime_mcall(mgc);
+		m = runtime_m();
 	}
 
 	// all done