Skip to content

K
k3s
Commit de0e6de8 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28430 from smarterclayton/fix_empty_deep_copy

Automatic merge from submit-queue WIP - Handle map[]struct{} in DeepCopy Deep copy was not properly handling the empty struct case we use for Sets. @lavalamp I need your expertise when you have some time - the go2idl parser is turning sets.String into the following tree: type: sets.String kind: Alias underlying: map[string]sets.Empty kind: Map key: string kind: Builtin elem: set.Empty kind: Struct ^ should be Alias Looking at tc.Named, I'm not sure what the expected outcome would be and why you flatten there.
parents 37edcc82 6eb04ae5
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 4 deletions
cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go
View file @ de0e6de8
...@@ -355,10 +355,17 @@ func (g *genDeepCopy) doBuiltin(t *types.Type, sw *generator.SnippetWriter) { ...@@ -355,10 +355,17 @@ func (g *genDeepCopy) doBuiltin(t *types.Type, sw *generator.SnippetWriter) {
func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) { func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) {
sw.Do("*out = make($.|raw$)\n", t) sw.Do("*out = make($.|raw$)\n", t)
if t.Key.IsAssignable() { if t.Key.IsAssignable() {
sw.Do("for key, val := range in {\n", nil) switch {
if t.Elem.IsAssignable() { case t.Elem.IsAnonymousStruct():
sw.Do("for key := range in {\n", nil)
sw.Do("(*out)[key] = struct{}{}\n", nil)
sw.Do("}\n", nil)
case t.Elem.IsAssignable():
sw.Do("for key, val := range in {\n", nil)
sw.Do("(*out)[key] = val\n", nil) sw.Do("(*out)[key] = val\n", nil)
} else { sw.Do("}\n", nil)
default:
sw.Do("for key, val := range in {\n", nil)
if g.canInlineTypeFn(g.context, t.Elem) { if g.canInlineTypeFn(g.context, t.Elem) {
sw.Do("newVal := new($.|raw$)\n", t.Elem) sw.Do("newVal := new($.|raw$)\n", t.Elem)
funcName := g.funcNameTmpl(t.Elem) funcName := g.funcNameTmpl(t.Elem)
...@@ -373,13 +380,14 @@ func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) { ...@@ -373,13 +380,14 @@ func (g *genDeepCopy) doMap(t *types.Type, sw *generator.SnippetWriter) {
sw.Do("(*out)[key] = newVal.($.|raw$)\n", t.Elem) sw.Do("(*out)[key] = newVal.($.|raw$)\n", t.Elem)
sw.Do("}\n", nil) sw.Do("}\n", nil)
} }
sw.Do("}\n", nil)
} }
} else { } else {
// TODO: Implement it when necessary. // TODO: Implement it when necessary.
sw.Do("for range in {\n", nil) sw.Do("for range in {\n", nil)
sw.Do("// FIXME: Copying unassignable keys unsupported $.|raw$\n", t.Key) sw.Do("// FIXME: Copying unassignable keys unsupported $.|raw$\n", t.Key)
sw.Do("}\n", nil)
} }
sw.Do("}\n", nil)
} }
func (g *genDeepCopy) doSlice(t *types.Type, sw *generator.SnippetWriter) { func (g *genDeepCopy) doSlice(t *types.Type, sw *generator.SnippetWriter) {
......
cmd/libs/go2idl/types/types.go
View file @ de0e6de8
...@@ -290,6 +290,12 @@ func (t *Type) IsAssignable() bool { ...@@ -290,6 +290,12 @@ func (t *Type) IsAssignable() bool {
return t.Kind == Builtin || (t.Kind == Alias && t.Underlying.Kind == Builtin) return t.Kind == Builtin || (t.Kind == Alias && t.Underlying.Kind == Builtin)
} }
// IsAnonymousStruct returns true if the type is an anonymous struct or an alias
// to an anonymous struct.
func (t *Type) IsAnonymousStruct() bool {
return (t.Kind == Struct && t.Name.Name == "struct{}") || (t.Kind == Alias && t.Underlying.IsAnonymousStruct())
}
// A single struct member // A single struct member
type Member struct { type Member struct {
// The name of the member. // The name of the member.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment