cmd/protoc-gen-go: fix generation of enum defaults

Previously, this call strconv.FormatInt with base 32, when the intention is to call it with base 10. Change-Id: I31cdd2415b3a80936cdcdeb5612a486204404ecb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/331149 Trust: Joe Tsai <[email protected]> Reviewed-by: Damien Neil <[email protected]>
protocolbuffers · Jun 27, 2021 · aa432c0 · aa432c0
1 parent 49b6f72
commit aa432c0
Show file tree

Hide file tree

Showing 5 changed files with 1,503 additions and 1,222 deletions.
diff --git a/cmd/protoc-gen-go/internal_gengo/main.go b/cmd/protoc-gen-go/internal_gengo/main.go
@@ -706,7 +706,7 @@ func fieldDefaultValue(g *protogen.GeneratedFile, f *fileInfo, m *messageInfo, f
 			// If the enum value is declared in a different Go package,
 			// reference it by number since the name may not be correct.
 			// See https://github.com/golang/protobuf/issues/513.
-			return g.QualifiedGoIdent(field.Enum.GoIdent) + "(" + strconv.FormatInt(int64(val.Desc.Number()), 32) + ")"
+			return g.QualifiedGoIdent(field.Enum.GoIdent) + "(" + strconv.FormatInt(int64(val.Desc.Number()), 10) + ")"
 		}
 	default:
 		return "0"

diff --git a/internal/testprotos/enums/enums.pb.go b/internal/testprotos/enums/enums.pb.go
diff --git a/internal/testprotos/enums/enums.proto b/internal/testprotos/enums/enums.proto
@@ -0,0 +1,20 @@
+// Copyright 2021 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+syntax = "proto2";
+
+package goproto.proto.enums;
+
+option go_package = "google.golang.org/protobuf/internal/testprotos/enums";
+
+enum Enum {
+  DEFAULT = 1337;
+  ZERO = 0;
+  ONE = 1;
+  ELEVENT = 11;
+  SEVENTEEN = 17;
+  THIRTYSEVEN = 37;
+  SIXTYSEVEN = 67;
+  NEGATIVE = -1;
+}