Commit fd150e77 authored by Russ Cox's avatar Russ Cox

gc: cut some dead code, fix 6g -S output

R=ken2
CC=golang-dev
https://golang.org/cl/193079
parent 5c7b0caa
...@@ -384,54 +384,3 @@ importmethod(Sym *s, Type *t) ...@@ -384,54 +384,3 @@ importmethod(Sym *s, Type *t)
addmethod(s, t, 0); addmethod(s, t, 0);
} }
/*
* ******* import *******
*/
void
checkimports(void)
{
Sym *s;
Type *t, *t1;
uint32 h;
int et;
return;
for(h=0; h<NHASH; h++)
for(s = hash[h]; s != S; s = s->link) {
if(s->def == N || s->def->op != OTYPE)
continue;
t = s->def->type;
if(t == T)
continue;
et = t->etype;
switch(t->etype) {
case TFORW:
print("ci-1: %S %lT\n", s, t);
break;
case TPTR32:
case TPTR64:
if(t->type == T) {
print("ci-2: %S %lT\n", s, t);
break;
}
t1 = t->type;
if(t1 == T) {
print("ci-3: %S %lT\n", s, t1);
break;
}
et = t1->etype;
if(et == TFORW) {
print("%L: ci-4: %S %lT\n", lineno, s, t);
break;
}
break;
}
}
}
...@@ -1025,7 +1025,6 @@ void importconst(Sym *s, Type *t, Node *v); ...@@ -1025,7 +1025,6 @@ void importconst(Sym *s, Type *t, Node *v);
void importmethod(Sym *s, Type *t); void importmethod(Sym *s, Type *t);
void importtype(Type *s, Type *t); void importtype(Type *s, Type *t);
void importvar(Sym *s, Type *t, int ctxt); void importvar(Sym *s, Type *t, int ctxt);
void checkimports(void);
Type* pkgtype(Sym*); Type* pkgtype(Sym*);
Sym* importsym(Sym*, int); Sym* importsym(Sym*, int);
......
...@@ -253,7 +253,6 @@ import_there: ...@@ -253,7 +253,6 @@ import_there:
hidden_import_list '$' '$' hidden_import_list '$' '$'
{ {
resumecheckwidth(); resumecheckwidth();
checkimports();
unimportfile(); unimportfile();
} }
......
...@@ -27,12 +27,22 @@ main(int argc, char *argv[]) ...@@ -27,12 +27,22 @@ main(int argc, char *argv[])
localpkg->prefix = "\"\""; localpkg->prefix = "\"\"";
builtinpkg = mkpkg(strlit("go.builtin")); builtinpkg = mkpkg(strlit("go.builtin"));
gostringpkg = mkpkg(strlit("go.string")); gostringpkg = mkpkg(strlit("go.string"));
gostringpkg->prefix = "go.string"; gostringpkg->name = "go.string";
gostringpkg->prefix = "go.string"; // not go%2estring
runtimepkg = mkpkg(strlit("runtime")); runtimepkg = mkpkg(strlit("runtime"));
runtimepkg->name = "runtime";
stringpkg = mkpkg(strlit("string")); stringpkg = mkpkg(strlit("string"));
stringpkg->name = "string";
typepkg = mkpkg(strlit("type")); typepkg = mkpkg(strlit("type"));
typepkg->name = "type";
unsafepkg = mkpkg(strlit("unsafe")); unsafepkg = mkpkg(strlit("unsafe"));
unsafepkg->name = "unsafe";
goroot = getgoroot(); goroot = getgoroot();
goos = getgoos(); goos = getgoos();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment