a real fix for issue261

gogo · Feb 26, 2017 · 83faaee · 83faaee
1 parent 1df7742
commit 83faaee
Show file tree

Hide file tree

Showing 3 changed files with 218 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -107,6 +107,7 @@ regenerate:
 	make -C test/data regenerate
 	make -C test/typedecl regenerate
 	make -C test/issue260 regenerate
+	make -C test/issue261 regenerate
 	make -C test/issue262 regenerate
 	make -C test/enumdecl regenerate
 	make -C test/typedecl_all regenerate

diff --git a/plugin/unmarshal/unmarshal.go b/plugin/unmarshal/unmarshal.go
@@ -735,10 +735,10 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip
 
 			// if the map type is an alias and key or values are aliases (type Foo map[Bar]Baz),
 			// we need to explicitly record their use here.
-			if m.KeyField != m.KeyAliasField {
+			if gogoproto.IsCastKey(field) {
 				p.RecordTypeUse(m.KeyAliasField.GetTypeName())
 			}
-			if m.ValueField != m.ValueAliasField {
+			if gogoproto.IsCastValue(field) {
 				p.RecordTypeUse(m.ValueAliasField.GetTypeName())
 			}
 

diff --git a/test/issue261/issue261.pb.go b/test/issue261/issue261.pb.go