summaryrefslogtreecommitdiff
path: root/src/cmd/6g
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-05-28 21:46:20 -0400
committerRuss Cox <rsc@golang.org>2014-05-28 21:46:20 -0400
commit112af3545d8afbaf7a95891ea78f94de9d79996d (patch)
tree262ab9c33ca01c4d0445235ae4c1f45da578dcbd /src/cmd/6g
parent73044738e146bec259f7b8e89ecc816a421921aa (diff)
downloadgo-112af3545d8afbaf7a95891ea78f94de9d79996d.tar.gz
undo CL 102820043 / b0ce6dbafc18
Breaks 386 and arm builds. The obvious reason is that this CL only edited 6g/gsubr.c and failed to edit 5g/gsubr.c and 8g/gsubr.c. However, the obvious CL applying the same edit to those files (CL 101900043) causes mysterious build failures in various of the standard package tests, usually involving reflect. Something deep and subtle is broken but only on the 32-bit systems. Undo this CL for now. ??? original CL description cmd/gc: fix x=x crash The 'nodarg' function is used to obtain a Node* representing a function argument or result. It returned a brand new Node*, but that violates the guarantee in most places in the compiler that two Node*s refer to the same variable if and only if they are the same Node* pointer. Reestablish that invariant by making nodarg return a preexisting named variable if present. Having fixed that, avoid any copy during x=x in componentgen, because the VARDEF we emit before the copy marks the lhs x as dead incorrectly. The change in walk.c avoids modifying the result of nodarg. This was the only place in the compiler that did so. Fixes issue 8097. LGTM=r, khr R=golang-codereviews, r, khr CC=golang-codereviews, iant https://codereview.appspot.com/102820043 ??? TBR=r CC=golang-codereviews, khr https://codereview.appspot.com/95660043
Diffstat (limited to 'src/cmd/6g')
-rw-r--r--src/cmd/6g/cgen.c7
-rw-r--r--src/cmd/6g/gsubr.c9
2 files changed, 0 insertions, 16 deletions
diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c
index 4dd505b08..ae1309142 100644
--- a/src/cmd/6g/cgen.c
+++ b/src/cmd/6g/cgen.c
@@ -1585,13 +1585,6 @@ componentgen(Node *nr, Node *nl)
freer = 1;
}
}
-
- // nl and nr are 'cadable' which basically means they are names (variables) now.
- // If they are the same variable, don't generate any code, because the
- // VARDEF we generate will mark the old value as dead incorrectly.
- // (And also the assignments are useless.)
- if(nr != N && nl->op == ONAME && nr->op == ONAME && nl == nr)
- goto yes;
switch(nl->type->etype) {
case TARRAY:
diff --git a/src/cmd/6g/gsubr.c b/src/cmd/6g/gsubr.c
index e4d00bf41..bd2f2304b 100644
--- a/src/cmd/6g/gsubr.c
+++ b/src/cmd/6g/gsubr.c
@@ -462,7 +462,6 @@ Node*
nodarg(Type *t, int fp)
{
Node *n;
- NodeList *l;
Type *first;
Iter savet;
@@ -483,14 +482,6 @@ nodarg(Type *t, int fp)
if(t->etype != TFIELD)
fatal("nodarg: not field %T", t);
-
- if(fp == 1) {
- for(l=curfn->dcl; l; l=l->next) {
- n = l->n;
- if((n->class == PPARAM || n->class == PPARAMOUT) && !isblanksym(t->sym) && n->sym == t->sym)
- return n;
- }
- }
n = nod(ONAME, N, N);
n->type = t->type;