diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-11-07 01:24:57 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-11-07 01:24:57 +0000 |
| commit | f5eb9a8ec6cff02f52d7a29d96ec6641d2a06de1 (patch) | |
| tree | fb4d9c89c2c9990d67757f795779aa52ee64305c /gcc/go | |
| parent | 39f02a1f52f661a49aa82e878bba152a468f1021 (diff) | |
| download | gcc-f5eb9a8ec6cff02f52d7a29d96ec6641d2a06de1.zip gcc-f5eb9a8ec6cff02f52d7a29d96ec6641d2a06de1.tar.gz gcc-f5eb9a8ec6cff02f52d7a29d96ec6641d2a06de1.tar.bz2 | |
re PR go/66138 (json decoder Decode function fails for some structure return values)
PR go/66138
reflect, encoding/json, encoding/xml: fix unexported embedded structs
Bring in three changes from the master Go repository. These changes
will be in Go 1.6, but they are appropriate for gccgo now because they
resolve a long-standing discrepancy between how gc and gccgo handle the
PkgPath field for embedded unexported struct fields. The core issue is
described at https://golang.org/cl/7247. This has been reported against
gccgo as https://gcc.gnu.org/PR66138.
The three changes being brought over are:
https://golang.org/cl/14010
reflect: adjust access to unexported embedded structs
This CL changes reflect to allow access to exported fields and
methods in unexported embedded structs for gccgo and after gc
has been adjusted to disallow access to embedded unexported structs.
Adresses #12367, #7363, #11007, and #7247.
https://golang.org/cl/14011
encoding/json: check for exported fields in embedded structs
Addresses issue #12367.
https://golang.org/cl/14012
encoding/xml: check for exported fields in embedded structs
Addresses issue #12367.
Reviewed-on: https://go-review.googlesource.com/16723
From-SVN: r229907
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index b17ca93..f325bb3 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -10c1d6756ed1dcc814c49921c2a5e27f4677e0e6 +012ab5cb2ef1c26e8023ce90d3a2bba174da7b30 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |