qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 12:30:14 -07:00
Code Releases Activity

gc: keep track of real actual type of identifiers.

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/2519042
This commit is contained in:
Luuk van Dijk 2010-10-15 21:25:34 +02:00
parent 9c20485268
commit 49a835fc97
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ enum
AMEMWORD, AMEMWORD,
BADWIDTH = -1000000000, BADWIDTH = -1000000000,
MAXWIDTH = 1<<30 MAXWIDTH = 1<<30
}; };
/* /*
@ -218,6 +218,7 @@ struct Node
Node* left; Node* left;
Node* right; Node* right;
Type* type; Type* type;
Type* realtype; // as determined by typecheck
NodeList* list; NodeList* list;
NodeList* rlist; NodeList* rlist;
@ -636,9 +637,9 @@ EXTERN Label* labellist;
* *
* typedef struct * typedef struct
* { // must not move anything * { // must not move anything
* uchar array[8]; // pointer to data * uchar array[8]; // pointer to data
* uchar nel[4]; // number of elements * uchar nel[4]; // number of elements
* uchar cap[4]; // allocated number of elements * uchar cap[4]; // allocated number of elements
* } Array; * } Array;
*/ */
EXTERN int Array_array; // runtime offsetof(Array,array) - same for String EXTERN int Array_array; // runtime offsetof(Array,array) - same for String
@ -653,8 +654,8 @@ EXTERN int sizeof_Array; // runtime sizeof(Array)
* *
* typedef struct * typedef struct
* { // must not move anything * { // must not move anything
* uchar array[8]; // pointer to data * uchar array[8]; // pointer to data
* uchar nel[4]; // number of elements * uchar nel[4]; // number of elements
* } String; * } String;
*/ */
EXTERN int sizeof_String; // runtime sizeof(String) EXTERN int sizeof_String; // runtime sizeof(String)

12
src/cmd/gc/subr.c
View File

@ -1273,7 +1273,7 @@ Tpretty(Fmt *fp, Type *t)
fmtprint(fp, "...%T", t->type->type); fmtprint(fp, "...%T", t->type->type);
else else
fmtprint(fp, "%T", t->type); fmtprint(fp, "%T", t->type);
if(t->note) { if(t->note) {
fmtprint(fp, " "); fmtprint(fp, " ");
if(exporting) if(exporting)
fmtprint(fp, ":"); fmtprint(fp, ":");
@ -3607,10 +3607,11 @@ umagic(Magic *m)
Sym* Sym*
ngotype(Node *n) ngotype(Node *n)
{ {
if(n->sym != S && strncmp(n->sym->name, "autotmp_", 8) != 0) if(n->sym != S && n->realtype != T)
if(n->type->etype != TFUNC || n->type->thistuple == 0) if(strncmp(n->sym->name, "autotmp_", 8) != 0)
if(n->type->etype != TSTRUCT || n->type->funarg == 0) if(strncmp(n->sym->name, "statictmp_", 8) != 0)
return typename(n->type)->left->sym; return typename(n->realtype)->left->sym;
return S; return S;
} }
@ -3684,4 +3685,3 @@ strlit(char *s)
t->len = strlen(s); t->len = strlen(s);
return t; return t;
} }

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

@ -80,7 +80,7 @@ typecheck(Node **np, int top)
n = *np; n = *np;
if(n == N) if(n == N)
return N; return N;
// Resolve definition of name and value of iota lazily. // Resolve definition of name and value of iota lazily.
n = resolve(n); n = resolve(n);
*np = n; *np = n;
@ -112,6 +112,7 @@ typecheck(Node **np, int top)
goto error; goto error;
} }
walkdef(n); walkdef(n);
n->realtype = n->type;
if(n->op == ONONAME) if(n->op == ONONAME)
goto error; goto error;
} }