From: Martin Möhrmann <moehrmann@google.com>
Date: Tue, 29 Aug 2017 19:32:41 +0000 (+0200)
Subject: cmd/compile: simplify check for pointers in map bucket
X-Git-Tag: go1.10beta1~1267
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2548d36c86bf78f4a535c8ffac6de2e2421e76df;p=gostls13.git

cmd/compile: simplify check for pointers in map bucket

Change-Id: Ie5e977c54f50274421962a7ca268ae71a6f19cef
Reviewed-on: https://go-review.googlesource.com/60050
Run-TryBot: Martin Möhrmann <moehrmann@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
---

diff --git a/src/cmd/compile/internal/gc/reflect.go b/src/cmd/compile/internal/gc/reflect.go
index a56edad3b4..9d9b43152e 100644
--- a/src/cmd/compile/internal/gc/reflect.go
+++ b/src/cmd/compile/internal/gc/reflect.go
@@ -157,7 +157,7 @@ func mapbucket(t *types.Type) *types.Type {
 	// the type of the overflow field to uintptr in this case.
 	// See comment on hmap.overflow in ../../../../runtime/hashmap.go.
 	otyp := types.NewPtr(bucket)
-	if !types.Haspointers(t.Val()) && !types.Haspointers(t.Key()) && t.Val().Width <= MAXVALSIZE && t.Key().Width <= MAXKEYSIZE {
+	if !types.Haspointers(valtype) && !types.Haspointers(keytype) {
 		otyp = types.Types[TUINTPTR]
 	}
 	overflow := makefield("overflow", otyp)