Automated g4 rollback of changelist 17815.
*** Reason for rollback ***
now it's comparing function parameter names...
*** Original change description ***
fix method function type compare bug
R=ken
OCL=17816
CL=17816
diff --git a/src/cmd/gc/dcl.c b/src/cmd/gc/dcl.c
index 9f88848..f836f3b 100644
--- a/src/cmd/gc/dcl.c
+++ b/src/cmd/gc/dcl.c
@@ -279,10 +279,8 @@
d = f;
continue;
}
- if(!eqtype(t, f->type, 0)) {
+ if(!eqtype(t, f->type, 0))
yyerror("method redeclared: %S of type %S", sf, st);
- print("\t%T\n\t%T\n", f->type, t);
- }
return;
}
@@ -342,8 +340,7 @@
if(!eqargs(n->type, on->type))
yyerror("forward declarations not the same: %S", s);
} else {
- yyerror("function redeclared: %S", s);
- print("\t%T\n\t%T\n", on->type, n->type);
+ yyerror("redeclare of function: %S", s);
on = N;
}
}
diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index dfe5913..4e1a9ea 100644
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -1773,7 +1773,7 @@
if(t1->etype != TSTRUCT || t2->etype != TSTRUCT)
return 0;
- if(!eqtype(t1, t2, 0))
+ if(!eqtype(t1->type, t2->type, 0))
return 0;
t1 = t1->down;
