don't try interface/structure conversion until

last resort, because it assumes every call is a
real use of the conversion.

R=ken
OCL=19026
CL=19026

diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index 13ad69a65adab42f6ba7fae1a497495bc6cfd429..e68833c42e6bf87196c41bfcece048f48cae1e31 100644 (file)
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -597,13 +597,6 @@ loop:
                if(isptrarray(t) && isptrdarray(l->type))
                        goto ret;
 
-               // interface and structure
-               et = isandss(n->type, l);
-               if(et != Inone) {
-                       indir(n, ifaceop(n->type, l, et));
-                       goto ret;
-               }
-
                // structure literal
                if(t->etype == TSTRUCT) {
                        indir(n, structlit(n));
@@ -624,6 +617,13 @@ loop:
                        goto ret;
                }
 
+               // interface and structure
+               et = isandss(n->type, l);
+               if(et != Inone) {
+                       indir(n, ifaceop(n->type, l, et));
+                       goto ret;
+               }
+
                if(l->type != T)
                        yyerror("cannot convert %T to %T", l->type, t);
                goto ret;