cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-18 22:04:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not migrate x to the heap because of *&x.

Browse Source 
R=ken
OCL=35799
CL=35799
This commit is contained in:
Russ Cox 2009-10-15 16:03:01 -07:00
parent 049501ce4c
commit a75e347a21
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/gc/go.h
View File

@ -477,6 +477,8 @@ enum
Efnstruct = 1<<5, // multivalue function returns are ok Efnstruct = 1<<5, // multivalue function returns are ok
Eiota = 1<<6, // iota is ok Eiota = 1<<6, // iota is ok
Easgn = 1<<7, // assigning to expression Easgn = 1<<7, // assigning to expression
Eindir = 1<<8, // indirecting through expression
Eaddr = 1<<9, // taking address of expression
}; };
#define BITS 5 #define BITS 5

36
src/cmd/gc/typecheck.c
View File

@ -51,7 +51,7 @@ typecheck(Node **np, int top)
int et, op; int et, op;
Node *n, *l, *r; Node *n, *l, *r;
NodeList *args; NodeList *args;
int lno, ok; int lno, ok, ntop;
Type *t; Type *t;
// cannot type check until all the source has been parsed // cannot type check until all the source has been parsed
@ -250,7 +250,10 @@ reswitch:
* type or expr * type or expr
*/ */
case OIND: case OIND:
l = typecheck(&n->left, Erv | Etype); ntop = Erv | Etype;
if(!(top & Eaddr))
ntop |= Eindir;
l = typecheck(&n->left, ntop);
if((t = l->type) == T) if((t = l->type) == T)
goto error; goto error;
if(l->op == OTYPE) { if(l->op == OTYPE) {
@ -409,7 +412,7 @@ reswitch:
*/ */
case OADDR: case OADDR:
ok |= Erv; ok |= Erv;
typecheck(&n->left, Erv); typecheck(&n->left, Erv | Eaddr);
if(n->left->type == T) if(n->left->type == T)
goto error; goto error;
switch(n->left->op) { switch(n->left->op) {
@ -424,7 +427,8 @@ reswitch:
l = n->left; l = n->left;
if((t = l->type) == T) if((t = l->type) == T)
goto error; goto error;
addrescapes(n->left); if(!(top & Eindir))
addrescapes(n->left);
n->type = ptrto(t); n->type = ptrto(t);
goto ret; goto ret;
@ -642,6 +646,18 @@ reswitch:
typecheck(&n->left, Erv | Etype | Ecall); typecheck(&n->left, Erv | Etype | Ecall);
defaultlit(&n->left, T); defaultlit(&n->left, T);
l = n->left; l = n->left;
if(l->op == OTYPE) {
// pick off before type-checking arguments
ok |= Erv;
// turn CALL(type, arg) into CONV(arg) w/ type
n->left = N;
if(onearg(n) < 0)
goto error;
n->op = OCONV;
n->type = l->type;
goto doconv;
}
if(count(n->list) == 1) if(count(n->list) == 1)
typecheck(&n->list->n, Erv | Efnstruct); typecheck(&n->list->n, Erv | Efnstruct);
else else
@ -651,16 +667,6 @@ reswitch:
checkwidth(t); checkwidth(t);
switch(l->op) { switch(l->op) {
case OTYPE:
ok |= Erv;
// turn CALL(type, arg) into CONV(arg) w/ type
n->left = N;
if(onearg(n) < 0)
goto error;
n->op = OCONV;
n->type = l->type;
goto doconv;
case ODOTINTER: case ODOTINTER:
n->op = OCALLINTER; n->op = OCALLINTER;
break; break;
@ -758,7 +764,7 @@ reswitch:
case OCONV: case OCONV:
doconv: doconv:
ok |= Erv; ok |= Erv;
typecheck(&n->left, Erv); typecheck(&n->left, Erv | (top & Eindir));
defaultlit(&n->left, n->type); defaultlit(&n->left, n->type);
if((t = n->left->type) == T || n->type == T) if((t = n->left->type) == T || n->type == T)
goto error; goto error;