diff options
| author | Keith Randall <khr@golang.org> | 2016-03-01 12:50:17 -0800 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2016-03-01 12:50:17 -0800 |
| commit | 9d854fd44ae669f60c15133a4d2ce407ea2bccc4 (patch) | |
| tree | c78f58c7e0d703df7b0cba0f0a7cbe9c0501e8bc /src/runtime/mgc.go | |
| parent | dd0a128a02c4894f2c17ab886852d6bd10c6c721 (diff) | |
| parent | 6b3462c784df961f22eea0c39490b38093086b83 (diff) | |
| download | go-9d854fd44ae669f60c15133a4d2ce407ea2bccc4.tar.xz | |
Merge branch 'dev.ssa' into mergebranch
Merge dev.ssa branch back into master.
Change-Id: Ie6fac3f8d355ab164f934415fe4fc7fcb8c3db16
Diffstat (limited to 'src/runtime/mgc.go')
| -rw-r--r-- | src/runtime/mgc.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go index df8b4536fa..138a623ca5 100644 --- a/src/runtime/mgc.go +++ b/src/runtime/mgc.go @@ -216,9 +216,10 @@ var gcphase uint32 // The compiler knows about this variable. // If you change it, you must change the compiler too. var writeBarrier struct { - enabled bool // compiler emits a check of this before calling write barrier - needed bool // whether we need a write barrier for current GC phase - cgo bool // whether we need a write barrier for a cgo check + enabled bool // compiler emits a check of this before calling write barrier + needed bool // whether we need a write barrier for current GC phase + cgo bool // whether we need a write barrier for a cgo check + alignme uint64 // guarantee alignment so that compiler can use a 32 or 64-bit load } // gcBlackenEnabled is 1 if mutator assists and background mark |