[go] reflect: remove unused overflowPad variable

0 views
Skip to first unread message

Ian Lance Taylor (Gerrit)

unread,
Apr 20, 2022, 6:49:30 PM4/20/22
to Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Keith Randall, Keith Randall, Gopher Robot, Ian Lance Taylor, Russ Cox, golang-co...@googlegroups.com

Ian Lance Taylor submitted this change.

View Change


Approvals: Keith Randall: Looks good to me, approved; Automatically submit change Keith Randall: Looks good to me, but someone else must approve Ian Lance Taylor: Looks good to me, but someone else must approve Ian Lance Taylor: Run TryBots Gopher Robot: TryBots succeeded
reflect: remove unused overflowPad variable

overflowPad variable in bucketOf function is a holdover from a NaCl port
and never used now.

Change-Id: Ib68fdb054e1b6a655ffbfd34521a3f8773a22694
GitHub-Last-Rev: f281be9c115a87605fd28b39c0b09eed54cc774a
GitHub-Pull-Request: golang/go#52449
Reviewed-on: https://go-review.googlesource.com/c/go/+/401274
Run-TryBot: Ian Lance Taylor <ia...@golang.org>
TryBot-Result: Gopher Robot <go...@golang.org>
Reviewed-by: Keith Randall <k...@golang.org>
Auto-Submit: Keith Randall <k...@golang.org>
Reviewed-by: Keith Randall <k...@google.com>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
---
M src/reflect/type.go
1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/reflect/type.go b/src/reflect/type.go
index e888266..97040b5 100644
--- a/src/reflect/type.go
+++ b/src/reflect/type.go
@@ -2244,15 +2244,14 @@
}

// Prepare GC data if any.
- // A bucket is at most bucketSize*(1+maxKeySize+maxValSize)+2*ptrSize bytes,
- // or 2072 bytes, or 259 pointer-size words, or 33 bytes of pointer bitmap.
+ // A bucket is at most bucketSize*(1+maxKeySize+maxValSize)+ptrSize bytes,
+ // or 2064 bytes, or 258 pointer-size words, or 33 bytes of pointer bitmap.
// Note that since the key and value are known to be <= 128 bytes,
// they're guaranteed to have bitmaps instead of GC programs.
var gcdata *byte
var ptrdata uintptr
- var overflowPad uintptr

- size := bucketSize*(1+ktyp.size+etyp.size) + overflowPad + goarch.PtrSize
+ size := bucketSize*(1+ktyp.size+etyp.size) + goarch.PtrSize
if size&uintptr(ktyp.align-1) != 0 || size&uintptr(etyp.align-1) != 0 {
panic("reflect: bad size computation in MapOf")
}
@@ -2271,7 +2270,6 @@
emitGCMask(mask, base, etyp, bucketSize)
}
base += bucketSize * etyp.size / goarch.PtrSize
- base += overflowPad / goarch.PtrSize

word := base
mask[word/8] |= 1 << (word % 8)
@@ -2291,9 +2289,6 @@
ptrdata: ptrdata,
gcdata: gcdata,
}
- if overflowPad > 0 {
- b.align = 8
- }
s := "bucket(" + ktyp.String() + "," + etyp.String() + ")"
b.str = resolveReflectName(newName(s, "", false))
return b

To view, visit change 401274. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: go
Gerrit-Branch: master
Gerrit-Change-Id: Ib68fdb054e1b6a655ffbfd34521a3f8773a22694
Gerrit-Change-Number: 401274
Gerrit-PatchSet: 2
Gerrit-Owner: Gerrit Bot <letsus...@gmail.com>
Gerrit-Reviewer: Gopher Robot <go...@golang.org>
Gerrit-Reviewer: Ian Lance Taylor <ia...@golang.org>
Gerrit-Reviewer: Ian Lance Taylor <ia...@google.com>
Gerrit-Reviewer: Keith Randall <k...@golang.org>
Gerrit-Reviewer: Keith Randall <k...@google.com>
Gerrit-Reviewer: Russ Cox <r...@golang.org>
Gerrit-MessageType: merged
Reply all
Reply to author
Forward
0 new messages