git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reflect: Fix bug comparing struct field types. 

From-SVN: r193395
This commit is contained in:
Ian Lance Taylor 2012-11-10 20:24:04 +00:00
parent c76b1db623
commit 7e03f00470
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libgo/go/reflect/type.go
View File

@ -363,7 +363,7 @@ type Method struct {
// PkgPath is the package path that qualifies a lower case (unexported) // PkgPath is the package path that qualifies a lower case (unexported)
// method name. It is empty for upper case (exported) method names. // method name. It is empty for upper case (exported) method names.
// The combination of PkgPath and Name uniquely identifies a method // The combination of PkgPath and Name uniquely identifies a method
// in a method set. // in a method set.
// See http://golang.org/ref/spec#Uniqueness_of_identifiers // See http://golang.org/ref/spec#Uniqueness_of_identifiers
Name string Name string
PkgPath string PkgPath string
@ -1309,8 +1309,19 @@ func haveIdenticalUnderlyingType(T, V *commonType) bool {
for i := range t.fields { for i := range t.fields {
tf := &t.fields[i] tf := &t.fields[i]
vf := &v.fields[i] vf := &v.fields[i]
if tf.name != vf.name || tf.pkgPath != vf.pkgPath || if tf.name != vf.name && (tf.name == nil || vf.name == nil || *tf.name != *vf.name) {
tf.typ != vf.typ || tf.tag != vf.tag || tf.offset != vf.offset { return false
}
if tf.pkgPath != vf.pkgPath && (tf.pkgPath == nil || vf.pkgPath == nil || *tf.pkgPath != *vf.pkgPath) {
return false
}
if tf.typ != vf.typ {
return false
}
if tf.tag != vf.tag && (tf.tag == nil || vf.tag == nil || *tf.tag != *vf.tag) {
return false
}
if tf.offset != vf.offset {
return false return false
} }
} }