From: Dmitriy Vyukov <dvyukov@google.com>
Date: Sat, 15 Jun 2013 12:02:39 +0000 (+0400)
Subject: runtime: remove unused moreframesize_minalloc field
X-Git-Tag: go1.2rc2~1241
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5caf762457420bf6df0298a8d363ab60216f03bc;p=gostls13.git

runtime: remove unused moreframesize_minalloc field
It was used to request large stack segment for GC
when it was running not on g0.
Now GC is running on g0 with large stack,
and it is not needed anymore.

R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/10242045
---

diff --git a/src/pkg/runtime/runtime.h b/src/pkg/runtime/runtime.h
index f004f1a42c..f62ee81de4 100644
--- a/src/pkg/runtime/runtime.h
+++ b/src/pkg/runtime/runtime.h
@@ -326,7 +326,6 @@ struct	M
 	void*	racepc;
 	void	(*waitunlockf)(Lock*);
 	void*	waitlock;
-	uint32	moreframesize_minalloc;
 
 	uintptr	settype_buf[1024];
 	uintptr	settype_bufsize;
diff --git a/src/pkg/runtime/stack.c b/src/pkg/runtime/stack.c
index a63e3b0c90..abfe0cfe43 100644
--- a/src/pkg/runtime/stack.c
+++ b/src/pkg/runtime/stack.c
@@ -173,7 +173,7 @@ runtime·oldstack(void)
 void
 runtime·newstack(void)
 {
-	int32 framesize, minalloc, argsize;
+	int32 framesize, argsize;
 	Stktop *top;
 	byte *stk;
 	uintptr sp;
@@ -196,19 +196,11 @@ runtime·newstack(void)
 		runtime·throw("runtime: stack split argsize");
 	}
 
-	minalloc = 0;
 	reflectcall = framesize==1;
-	if(reflectcall) {
+	if(reflectcall)
 		framesize = 0;
-		// moreframesize_minalloc is only set in runtime·gc(),
-		// that calls newstack via reflect·call().
-		minalloc = m->moreframesize_minalloc;
-		m->moreframesize_minalloc = 0;
-		if(framesize < minalloc)
-			framesize = minalloc;
-	}
 
-	if(reflectcall && minalloc == 0 && m->morebuf.sp - sizeof(Stktop) - argsize - 32 > gp->stackguard) {
+	if(reflectcall && m->morebuf.sp - sizeof(Stktop) - argsize - 32 > gp->stackguard) {
 		// special case: called from reflect.call (framesize==1)
 		// to call code with an arbitrary argument size,
 		// and we have enough space on the current stack.