random reflection improvements #3470
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ target triple = "wasm32-unknown-wasi" | |
| @"reflect/types.type:basic:int" = linkonce_odr constant { i8, ptr } { i8 2, ptr @"reflect/types.type:pointer:basic:int" }, align 4 | ||
| @"reflect/types.type:pointer:basic:int" = linkonce_odr constant { i8, ptr } { i8 21, ptr @"reflect/types.type:basic:int" }, align 4 | ||
| @"reflect/types.type:pointer:named:error" = linkonce_odr constant { i8, ptr } { i8 21, ptr @"reflect/types.type:named:error" }, align 4 | ||
| @"reflect/types.type:named:error" = linkonce_odr constant { i8, ptr, ptr, i32, [5 x i8] } { i8 52, ptr @"reflect/types.type:pointer:named:error", ptr @"reflect/types.type:interface:{Error:func:{}{basic:string}}", i32 5, [5 x i8] c"error" }, align 4 | ||
| @"reflect/types.type:interface:{Error:func:{}{basic:string}}" = linkonce_odr constant { i8, ptr } { i8 20, ptr @"reflect/types.type:pointer:interface:{Error:func:{}{basic:string}}" }, align 4 | ||
| @"reflect/types.type:pointer:interface:{Error:func:{}{basic:string}}" = linkonce_odr constant { i8, ptr } { i8 21, ptr @"reflect/types.type:interface:{Error:func:{}{basic:string}}" }, align 4 | ||
| @"reflect/types.type:pointer:interface:{String:func:{}{basic:string}}" = linkonce_odr constant { i8, ptr } { i8 21, ptr @"reflect/types.type:interface:{String:func:{}{basic:string}}" }, align 4 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,7 +71,7 @@ var deepEqualTests = []DeepEqualTest{ | |
| {&[3]int{1, 2, 3}, &[3]int{1, 2, 3}, true}, | ||
| {Basic{1, 0.5}, Basic{1, 0.5}, true}, | ||
| {error(nil), error(nil), true}, | ||
| {map[int]string{1: "one", 2: "two"}, map[int]string{2: "two", 1: "one"}, true}, | ||
| {fn1, fn2, true}, | ||
| {[]byte{1, 2, 3}, []byte{1, 2, 3}, true}, | ||
| {[]MyByte{1, 2, 3}, []MyByte{1, 2, 3}, true}, | ||
|
|
@@ -87,10 +87,10 @@ var deepEqualTests = []DeepEqualTest{ | |
| {&[3]int{1, 2, 3}, &[3]int{1, 2, 4}, false}, | ||
| {Basic{1, 0.5}, Basic{1, 0.6}, false}, | ||
| {Basic{1, 0}, Basic{2, 0}, false}, | ||
| {map[int]string{1: "one", 3: "two"}, map[int]string{2: "two", 1: "one"}, false}, | ||
| {map[int]string{1: "one", 2: "txo"}, map[int]string{2: "two", 1: "one"}, false}, | ||
| {map[int]string{1: "one"}, map[int]string{2: "two", 1: "one"}, false}, | ||
| {map[int]string{2: "two", 1: "one"}, map[int]string{1: "one"}, false}, | ||
| {nil, 1, false}, | ||
| {1, nil, false}, | ||
| {fn1, fn3, false}, | ||
|
|
@@ -104,16 +104,16 @@ var deepEqualTests = []DeepEqualTest{ | |
| {&[1]float64{math.NaN()}, self{}, true}, | ||
| {[]float64{math.NaN()}, []float64{math.NaN()}, false}, | ||
| {[]float64{math.NaN()}, self{}, true}, | ||
| {map[float64]float64{math.NaN(): 1}, map[float64]float64{1: 2}, false}, | ||
| {map[float64]float64{math.NaN(): 1}, self{}, true}, | ||
|
|
||
| // Nil vs empty: not the same. | ||
| {[]int{}, []int(nil), false}, | ||
| {[]int{}, []int{}, true}, | ||
| {[]int(nil), []int(nil), true}, | ||
| {map[int]int{}, map[int]int(nil), false}, | ||
| {map[int]int{}, map[int]int{}, true}, | ||
| {map[int]int(nil), map[int]int(nil), true}, | ||
|
|
||
| // Mismatched types | ||
| {1, 1.0, false}, | ||
|
|
@@ -130,8 +130,8 @@ var deepEqualTests = []DeepEqualTest{ | |
| // Possible loops. | ||
| {&loopy1, &loopy1, true}, | ||
| {&loopy1, &loopy2, true}, | ||
| {&cycleMap1, &cycleMap2, true}, | ||
| {&cycleMap1, &cycleMap3, false}, | ||
| } | ||
|
|
||
| func TestDeepEqual(t *testing.T) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,6 +33,8 @@ | |
| // - map types (this is still missing the key and element types) | ||
| // meta uint8 | ||
| // ptrTo *typeStruct | ||
| // elem *typeStruct | ||
| // key *typeStruct | ||
| // - struct types (see structType): | ||
| // meta uint8 | ||
| // numField uint16 | ||
|
|
@@ -408,6 +410,21 @@ type arrayType struct { | |
| arrayLen uintptr | ||
| } | ||
|
|
||
| type mapType struct { | ||
| rawType | ||
| ptrTo *rawType | ||
| elem *rawType | ||
| key *rawType | ||
| } | ||
|
|
||
| type namedType struct { | ||
| rawType | ||
| ptrTo *rawType | ||
| underlying *rawType | ||
| nlen uintptr | ||
| name [1]byte | ||
| } | ||
|
|
||
| // Type for struct types. The numField value is intentionally put before ptrTo | ||
| // for better struct packing on 32-bit and 64-bit architectures. On these | ||
| // architectures, the ptrTo field still has the same offset as in all the other | ||
|
|
@@ -430,31 +447,45 @@ type structField struct { | |
| // Equivalent to (go/types.Type).Underlying(): if this is a named type return | ||
| // the underlying type, else just return the type itself. | ||
| func (t *rawType) underlying() *rawType { | ||
| if t.isNamed() { | ||
| return (*elemType)(unsafe.Pointer(t)).elem | ||
dgryski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| return t | ||
| } | ||
|
|
||
| func (t *rawType) isNamed() bool { | ||
| return t.meta&flagNamed != 0 | ||
| } | ||
|
|
||
| func TypeOf(i interface{}) Type { | ||
| return ValueOf(i).typecode | ||
| } | ||
|
|
||
| func PtrTo(t Type) Type { return PointerTo(t) } | ||
|
|
||
| func PointerTo(t Type) Type { | ||
| return pointerTo(t.(*rawType)) | ||
| } | ||
|
|
||
| func pointerTo(t *rawType) *rawType { | ||
| switch t.Kind() { | ||
| case Pointer: | ||
| panic("reflect: cannot make **T type") | ||
| case Struct: | ||
| return (*structType)(unsafe.Pointer(t)).ptrTo | ||
| default: | ||
| return (*elemType)(unsafe.Pointer(t)).ptrTo | ||
|
Comment on lines
476
to
+477
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| func (t *rawType) String() string { | ||
| if t.isNamed() { | ||
| // TODO(dgryski): lookup named type here | ||
| return "T" | ||
| } | ||
| // TODO(dgryski): doesn't yet handle complex types | ||
| return t.Kind().String() | ||
| } | ||
|
|
||
| func (t *rawType) Kind() Kind { | ||
|
|
@@ -472,13 +503,21 @@ func (t *rawType) elem() *rawType { | |
| switch underlying.Kind() { | ||
| case Pointer: | ||
| return (*ptrType)(unsafe.Pointer(underlying)).elem | ||
| case Chan, Slice, Array, Map: | ||
| return (*elemType)(unsafe.Pointer(underlying)).elem | ||
| default: | ||
| panic("unimplemented: (reflect.Type).Elem()") | ||
dgryski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
|
|
||
| func (t *rawType) key() *rawType { | ||
| underlying := t.underlying() | ||
| if underlying.Kind() != Map { | ||
| panic("key called on non-map type") | ||
| } | ||
| return (*mapType)(unsafe.Pointer(underlying)).key | ||
| } | ||
|
|
||
| // Field returns the type of the i'th field of this struct type. It panics if t | ||
| // is not a struct type. | ||
| func (t *rawType) Field(i int) StructField { | ||
|
|
@@ -768,6 +807,29 @@ func (t *rawType) Comparable() bool { | |
| } | ||
| } | ||
|
|
||
| // isbinary() returns if the hashmapAlgorithmBinary functions can be used on this type | ||
| func (t *rawType) isBinary() bool { | ||
| switch t.Kind() { | ||
| case Bool, Int, Int8, Int16, Int32, Int64, Uint, Uint8, Uint16, Uint32, Uint64, Uintptr: | ||
| return true | ||
| case Float32, Float64, Complex64, Complex128: | ||
| return true | ||
| case Pointer: | ||
| return true | ||
| case Array: | ||
| return t.elem().isBinary() | ||
| case Struct: | ||
| numField := t.NumField() | ||
| for i := 0; i < numField; i++ { | ||
| if !t.rawField(i).Type.isBinary() { | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func (t rawType) ChanDir() ChanDir { | ||
| panic("unimplemented: (reflect.Type).ChanDir()") | ||
| } | ||
|
|
@@ -793,11 +855,24 @@ func (t *rawType) NumMethod() int { | |
| } | ||
|
|
||
| func (t *rawType) Name() string { | ||
| if t.isNamed() { | ||
| ntype := (*namedType)(unsafe.Pointer(t)) | ||
| name := stringHeader{ | ||
| data: unsafe.Pointer(&ntype.name), | ||
| len: ntype.nlen, | ||
| } | ||
| return *(*string)(unsafe.Pointer(&name)) | ||
dgryski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| return t.Kind().String() | ||
| } | ||
|
|
||
| func (t *rawType) Key() Type { | ||
| if t.Kind() != Map { | ||
| panic(TypeError{"Key"}) | ||
| } | ||
|
|
||
| return t.key() | ||
| } | ||
|
|
||
| func (t rawType) In(i int) Type { | ||
|
|
@@ -816,12 +891,52 @@ func (t rawType) PkgPath() string { | |
| panic("unimplemented: (reflect.Type).PkgPath()") | ||
| } | ||
|
|
||
| func (t *rawType) FieldByName(name string) (StructField, bool) { | ||
| if t.Kind() != Struct { | ||
| panic(TypeError{"FieldByName"}) | ||
| } | ||
|
|
||
| numField := t.NumField() | ||
|
|
||
| // This is incredibly inefficient | ||
dgryski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| for i := 0; i < numField; i++ { | ||
| field := t.rawField(i) | ||
| if field.Name == name { | ||
| return StructField{ | ||
| Name: field.Name, | ||
| PkgPath: field.PkgPath, | ||
| Type: field.Type, // note: converts rawType to Type | ||
| Tag: field.Tag, | ||
| Anonymous: field.Anonymous, | ||
| Offset: field.Offset, | ||
| }, true | ||
| } | ||
| } | ||
|
|
||
| return StructField{}, false | ||
| } | ||
|
|
||
| func (t *rawType) FieldByIndex(index []int) StructField { | ||
| ftype := t | ||
| var field rawStructField | ||
|
|
||
| for _, n := range index { | ||
| if ftype.Kind() != Struct { | ||
| panic(TypeError{"FieldByIndex"}) | ||
| } | ||
|
|
||
| field = ftype.rawField(n) | ||
| ftype = field.Type | ||
| } | ||
|
|
||
| return StructField{ | ||
| Name: field.Name, | ||
| PkgPath: field.PkgPath, | ||
| Type: field.Type, // note: converts rawType to Type | ||
| Tag: field.Tag, | ||
| Anonymous: field.Anonymous, | ||
| Offset: field.Offset, | ||
| } | ||
| } | ||
|
|
||
| // A StructField describes a single field in a struct. | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are missing the corresponding update to the comment at the top of src/reflect/type.go.