robs bug converting unsafe.pointer

R=r
OCL=20834
CL=20834

diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index dc6de63c6c6579a74067655c7766795e5c0dc594..775a4cca12d46dd383b439af277b50fc988f5f3f 100644 (file)
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -156,6 +156,7 @@ struct      Type
        uchar   embedded;       // TFIELD embedded type
        uchar   siggen;
        uchar   funarg;
+       uchar   copyany;
 
        // TFUNCT
        uchar   thistuple;

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index cd2fc4d2d53440a78e0cafe804c08b872b633a60..5638df4b7ddec8e9c9e697a1436eb2c15f351fff 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -1779,6 +1779,8 @@ loop:
                goto loop;
 
        case TANY:
+               if(!st->copyany)
+                       return 0;
                *stp = t;
                break;
 
@@ -1841,6 +1843,11 @@ deep(Type *t)
                nt = t; // share from here down
                break;
 
+       case TANY:
+               nt = shallow(t);
+               nt->copyany = 1;
+               break;
+
        case TPTR32:
        case TPTR64:
        case TCHAN: