Patchwork libgo patch committed: Correct flag

login
register
mail settings
Submitter Ian Taylor
Date Nov. 9, 2013, 4:23 p.m.
Message ID <mcrbo1tczo9.fsf@iant-glaptop.roam.corp.google.com>
Download mbox | patch
Permalink /patch/290002/
State New
Headers show

Comments

Ian Taylor - Nov. 9, 2013, 4:23 p.m.
In the recent libgo update I used the wrong flag value: FlagNoGC where I
should have used FlagNoInvokeGC.  This patch fixes the bug.
Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu.
Committed to mainline.

Ian

Patch

diff -r d956ad070046 libgo/runtime/malloc.goc
--- a/libgo/runtime/malloc.goc	Fri Nov 08 09:32:03 2013 -0800
+++ b/libgo/runtime/malloc.goc	Sat Nov 09 08:15:14 2013 -0800
@@ -78,7 +78,7 @@ 
 		flag |= FlagNoGC;
 	}
 
-	if(runtime_gcwaiting() && g != m->g0 && m->locks == 0 && !(flag & FlagNoGC)) {
+	if(runtime_gcwaiting() && g != m->g0 && m->locks == 0 && !(flag & FlagNoInvokeGC)) {
 		runtime_gosched();
 		m = runtime_m();
 	}