internal/filetype: fix EnumInfo.New
Previously panicked due to operating on the *T instead of the T.
Change-Id: I2aa23a63d1451d1fb29351abbe230d8d2518bd69
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/192579
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/internal/filetype/build.go b/internal/filetype/build.go
index b89a688..2f12bb3 100644
--- a/internal/filetype/build.go
+++ b/internal/filetype/build.go
@@ -297,9 +297,7 @@
}
func (t *EnumInfo) New(n pref.EnumNumber) pref.Enum {
- v := reflect.New(t.goType)
- v.SetInt(int64(n))
- return v.Interface().(pref.Enum)
+ return reflect.ValueOf(n).Convert(t.goType).Interface().(pref.Enum)
}
func (t *EnumInfo) GoType() reflect.Type { return t.goType }
func (t *EnumInfo) Descriptor() pref.EnumDescriptor { return t.desc }
diff --git a/internal/filetype/enum_test.go b/internal/filetype/enum_test.go
new file mode 100644
index 0000000..59badb2
--- /dev/null
+++ b/internal/filetype/enum_test.go
@@ -0,0 +1,23 @@
+// Copyright 2019 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.
+
+package filetype_test
+
+import (
+ "reflect"
+ "testing"
+
+ testpb "google.golang.org/protobuf/internal/testprotos/test"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+)
+
+func TestEnum(t *testing.T) {
+ et := testpb.ForeignEnum_FOREIGN_FOO.Type()
+ if got, want := et.GoType(), reflect.TypeOf(testpb.ForeignEnum_FOREIGN_FOO); got != want {
+ t.Errorf("testpb.ForeignEnum_FOREIGN_FOO.Type().GoType() = %v, want %v", got, want)
+ }
+ if got, want := et.New(pref.EnumNumber(testpb.ForeignEnum_FOREIGN_FOO)), pref.Enum(testpb.ForeignEnum_FOREIGN_FOO); got != want {
+ t.Errorf("testpb.ForeignEnum_FOREIGN_FOO.Type().New() = %[1]T(%[1]v), want %[2]T(%[2]v)", got, want)
+ }
+}
