From: Russ Cox Date: Thu, 15 Jul 2010 22:25:32 +0000 (-0700) Subject: gc: issue 894 X-Git-Tag: weekly.2010-07-29~96 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b2a919fc2976cfdea24339a19c086b2da31db141;p=gostls13.git gc: issue 894 Fixes #894. R=ken2 CC=golang-dev https://golang.org/cl/1701051 --- diff --git a/src/cmd/5g/ggen.c b/src/cmd/5g/ggen.c index 3243bb8634..bbcb7f728f 100644 --- a/src/cmd/5g/ggen.c +++ b/src/cmd/5g/ggen.c @@ -794,6 +794,8 @@ cgen_inline(Node *n, Node *res) goto no; if(!n->left->addable) goto no; + if(n->left->sym == S) + goto no; if(n->left->sym->pkg != runtimepkg) goto no; if(strcmp(n->left->sym->name, "slicearray") == 0) diff --git a/src/cmd/6g/ggen.c b/src/cmd/6g/ggen.c index 59a6d529dc..21b6237a31 100644 --- a/src/cmd/6g/ggen.c +++ b/src/cmd/6g/ggen.c @@ -1183,6 +1183,8 @@ cgen_inline(Node *n, Node *res) goto no; if(!n->left->addable) goto no; + if(n->left->sym == S) + goto no; if(n->left->sym->pkg != runtimepkg) goto no; if(strcmp(n->left->sym->name, "slicearray") == 0) diff --git a/src/cmd/8g/ggen.c b/src/cmd/8g/ggen.c index 8a55ffd598..e9a5454eb2 100644 --- a/src/cmd/8g/ggen.c +++ b/src/cmd/8g/ggen.c @@ -889,6 +889,8 @@ cgen_inline(Node *n, Node *res) goto no; if(!n->left->addable) goto no; + if(n->left->sym == S) + goto no; if(n->left->sym->pkg != runtimepkg) goto no; if(strcmp(n->left->sym->name, "slicearray") == 0)