Fix buffer reuse

Makefile

@@ -137,6 +137,7 @@ regenerate:
 	make -C test/issue503 regenerate
 	make -C test/issue530 regenerate
 	make -C test/issue617 regenerate
+	make -C test/protobuffer regenerate
 
 	make gofmt
 

proto/table_marshal.go

@@ -2930,10 +2930,23 @@ func Size(pb Message) int {
 	return info.Size(pb)
 }
 
+type reverseMarshaler interface {
+	MarshalToSizedBuffer([]byte) (int, error)
+	Size() int
+}
+
 // Marshal takes a protocol buffer message
 // and encodes it into the wire format, returning the data.
 // This is the main entry point.
 func Marshal(pb Message) ([]byte, error) {
+	if m, ok := pb.(reverseMarshaler); ok {
+		b := make([]byte, m.Size())
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
 	if m, ok := pb.(newMarshaler); ok {
 		siz := m.XXX_Size()
 		b := make([]byte, 0, siz)
@@ -2965,6 +2978,17 @@ func (p *Buffer) Marshal(pb Message) error {
 		if _, ok := pb.(Marshaler); ok {
 			return fmt.Errorf("proto: deterministic not supported by the Marshal method of %T", pb)
 		}
+		if _, ok := pb.(reverseMarshaler); ok {
+			return fmt.Errorf("proto: deterministic not supported by the Marshal method of %T", pb)
+		}
+
+	}
+	if m, ok := pb.(reverseMarshaler); ok {
+		siz := m.Size()
+		p.grow(siz) // make sure buf has enough capacity
+		n, err := m.MarshalToSizedBuffer(p.buf[len(p.buf) : len(p.buf)+siz])
+		p.buf = p.buf[:len(p.buf)+n]
+		return err
 	}
 	if m, ok := pb.(newMarshaler); ok {
 		siz := m.XXX_Size()

protoc-gen-gogo/generator/generator.go

@@ -2717,8 +2717,7 @@ func (g *Generator) generateCommonMethods(mc *msgCtx) {
 	if gogoproto.IsMarshaler(g.file.FileDescriptorProto, mc.message.DescriptorProto) ||
 		gogoproto.IsUnsafeMarshaler(g.file.FileDescriptorProto, mc.message.DescriptorProto) {
 		if gogoproto.IsStableMarshaler(g.file.FileDescriptorProto, mc.message.DescriptorProto) {
-			g.P("b = b[:cap(b)]")
-			g.P("n, err := m.MarshalToSizedBuffer(b)")
+			g.P("n, err := m.MarshalTo(b)")
 			g.P("if err != nil {")
 			g.In()
 			g.P("return nil, err")
@@ -2731,8 +2730,7 @@ func (g *Generator) generateCommonMethods(mc *msgCtx) {
 			g.P("return xxx_messageInfo_", mc.goName, ".Marshal(b, m, deterministic)")
 			g.P("} else {")
 			g.In()
-			g.P("b = b[:cap(b)]")
-			g.P("n, err := m.MarshalToSizedBuffer(b)")
+			g.P("n, err := m.MarshalTo(b)")
 			g.P("if err != nil {")
 			g.In()
 			g.P("return nil, err")