Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-10-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc

Browse source 
This is to reduce the delta between dev.cc and dev.garbage to just garbage collector changes.

These are the files that had merge conflicts and have been edited by hand:
        malloc.go
        mem_linux.go
        mgc.go
        os1_linux.go
        proc1.go
        panic1.go
        runtime1.go

LGTM=austin
R=austin
CC=golang-codereviews
https://golang.org/cl/174180043
This commit is contained in:
Russ Cox 2014-11-14 12:10:52 -05:00
commit 3e804631d9
171 changed files with 40822 additions and 3022 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/runtime/malloc.go
View file

@ -4,9 +4,7 @@
package runtime
import (
"unsafe"
)
import "unsafe"
const (
debugMalloc = false
@ -253,8 +251,10 @@ func mallocgc(size uintptr, typ *_type, flags uint32) unsafe.Pointer {
goto marked
}
ptrmask = (*uint8)(unsafe.Pointer(uintptr(typ.gc[0])))
// Check whether the program is already unrolled.
if uintptr(atomicloadp(unsafe.Pointer(ptrmask)))&0xff == 0 {
// Check whether the program is already unrolled
// by checking if the unroll flag byte is set
maskword := uintptr(atomicloadp(unsafe.Pointer(ptrmask)))
if *(*uint8)(unsafe.Pointer(&maskword)) == 0 {
systemstack(func() {
unrollgcprog_m(typ)
})