qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 10:50:13 -07:00
Code Releases Activity

runtime: use morePointers and isPointer in more places

Browse Source 
This makes this code better self-documenting and makes it easier to
find these places in the future.

Change-Id: I31dc5598ae67f937fb9ef26df92fd41d01e983c3
Reviewed-on: https://go-review.googlesource.com/22631
Reviewed-by: Rick Hudson <rlh@golang.org>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Austin Clements 2016-04-29 15:19:11 -04:00
parent a5d3f7ece9
commit d5e3d08b3a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/cgocall.go
View File

@ -559,12 +559,11 @@ func cgoCheckUnknownPointer(p unsafe.Pointer, msg string) (base, i uintptr) {
} }
n := span.elemsize n := span.elemsize
for i = uintptr(0); i < n; i += sys.PtrSize { for i = uintptr(0); i < n; i += sys.PtrSize {
bits := hbits.bits() if i >= 2*sys.PtrSize && !hbits.morePointers() {
if i >= 2*sys.PtrSize && bits&bitMarked == 0 {
// No more possible pointers. // No more possible pointers.
break break
} }
if bits&bitPointer != 0 { if hbits.isPointer() {
if cgoIsGoPointer(*(*unsafe.Pointer)(unsafe.Pointer(base + i))) { if cgoIsGoPointer(*(*unsafe.Pointer)(unsafe.Pointer(base + i))) {
panic(errorString(msg)) panic(errorString(msg))
} }

5
src/runtime/mgcmark.go
View File

@ -1132,11 +1132,10 @@ func scanobject(b uintptr, gcw *gcWork) {
// in the type bit for the one word. The only one-word objects // in the type bit for the one word. The only one-word objects
// are pointers, or else they'd be merged with other non-pointer // are pointers, or else they'd be merged with other non-pointer
// data into larger allocations. // data into larger allocations.
bits := hbits.bits() if i >= 2*sys.PtrSize && !hbits.morePointers() {
if i >= 2*sys.PtrSize && bits&bitMarked == 0 {
break // no more pointers in this object break // no more pointers in this object
} }
if bits&bitPointer == 0 { if !hbits.isPointer() {
continue // not a pointer continue // not a pointer
} }