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 3243bb86343c4464b0ca6f7084577b22fac5f249..bbcb7f728fa66ec76c6d539857419c81be0c8618 100644 (file)
--- 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 59a6d529dc824e02227cd73ed1936bc19b5975fa..21b6237a31096d8cf3d4ba663e9bca516fe7bb31 100644 (file)
--- 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 8a55ffd5987239f642ed9195549b08c229f4b157..e9a5454eb2f5dfbbda5d6e258c56a2a962e8e714 100644 (file)
--- 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)