diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-28 08:23:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-28 08:23:59 -0400 |
commit | 74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3 (patch) | |
tree | af0904e9ec643dea2caa8d39a55764adc38c069f /vendor/google.golang.org/protobuf/proto/encode.go | |
parent | 061c93f70101026d79cca6e75ac0c565e1fa99ec (diff) | |
parent | 90a86cad3a6f007c6708406d8a78528fbb302a0a (diff) | |
download | podman-74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3.tar.gz podman-74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3.tar.bz2 podman-74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3.zip |
Merge pull request #7472 from containers/dependabot/go_modules/k8s.io/apimachinery-0.19.0
Bump k8s.io/apimachinery from 0.18.8 to 0.19.0
Diffstat (limited to 'vendor/google.golang.org/protobuf/proto/encode.go')
-rw-r--r-- | vendor/google.golang.org/protobuf/proto/encode.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/google.golang.org/protobuf/proto/encode.go b/vendor/google.golang.org/protobuf/proto/encode.go index 456bfda47..7b47a1180 100644 --- a/vendor/google.golang.org/protobuf/proto/encode.go +++ b/vendor/google.golang.org/protobuf/proto/encode.go @@ -134,6 +134,9 @@ func (o MarshalOptions) MarshalState(in protoiface.MarshalInput) (protoiface.Mar return o.marshal(in.Buf, in.Message) } +// marshal is a centralized function that all marshal operations go through. +// For profiling purposes, avoid changing the name of this function or +// introducing other code paths for marshal that do not go through this. func (o MarshalOptions) marshal(b []byte, m protoreflect.Message) (out protoiface.MarshalOutput, err error) { allowPartial := o.AllowPartial o.AllowPartial = true @@ -206,7 +209,7 @@ func growcap(oldcap, wantcap int) (newcap int) { func (o MarshalOptions) marshalMessageSlow(b []byte, m protoreflect.Message) ([]byte, error) { if messageset.IsMessageSet(m.Descriptor()) { - return marshalMessageSet(b, m, o) + return o.marshalMessageSet(b, m) } // There are many choices for what order we visit fields in. The default one here // is chosen for reasonable efficiency and simplicity given the protoreflect API. |