Deep copy should always use existing functions that are not ignored

While testing this fix in OpenShift it was discovered that the PackageConstraint was overly aggressive - types that declare a public copy function should always return true. PackageConstraint is intended to limit packages where we might generate deep copy function, rather than to prevent external packages from being consumed.

Deep copy should always use existing functions that are not ignored
534075f8 · Clayton Coleman · 903a2db9 · 534075f8
Unverified Commit 534075f8 authored Jul 03, 2016 by Clayton Coleman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

deepcopy.go cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go +4 -2

No files found.
--- a/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go
+++ b/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go
@@ -118,10 +118,12 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 			// avoid having to make a reflection call.
 			canInlineTypeFn := func(c *generator.Context, t *types.Type) bool {
 				// types must be public structs or have a custom DeepCopy_<method> already defined
-				if !copyableWithinPackage(t, explicitInputs.Has(t.Name.Package)) && !publicCopyFunctionDefined(c, t) {
+				if publicCopyFunctionDefined(c, t) {
+					return true
+				}
+				if !copyableWithinPackage(t, explicitInputs.Has(t.Name.Package)) {
 					return false
 				}
-
 				// only packages within the restricted range can be inlined
 				for _, s := range restrictRange {
 					if strings.HasPrefix(t.Name.Package, s) {